commit a9952cb0c40876031a652b467b813dfcb80d5f2b
author Elad Alon <eladalon@webrtc.org> Tue Jun 11 17:03:16 2019
committer Commit Bot <commit-bot@chromium.org> Wed Jun 12 08:18:28 2019
tree a073c60c54591e8ec033ffd42d80a1f65a636e92
parent 47ae30358e7966488e4c4249e28988a180af9d18

Uncomment "override" in simulcast_encoder_adapter_unittest.cc

Bug: None
Change-Id: I4f07bb27d08ccac43adb59c90823e487fa0cced3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140951
Commit-Queue: Elad Alon <eladalon@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28246}

media/engine/simulcast_encoder_adapter_unittest.cc

diff --git a/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc
index 6bf99a5..fd5e5ff 100644
--- a/media/engine/simulcast_encoder_adapter_unittest.cc
+++ b/media/engine/simulcast_encoder_adapter_unittest.cc
@@ -192,7 +192,7 @@
   // warnings from -Winconsistent-missing-override. See
   // http://crbug.com/428099.
   int32_t InitEncode(const VideoCodec* codecSettings,
-                     const VideoEncoder::Settings& settings) /* override */ {
+                     const VideoEncoder::Settings& settings) override {
     codec_ = *codecSettings;
     return init_encode_return_value_;
   }
@@ -203,12 +203,12 @@
               const std::vector<VideoFrameType>* frame_types) /* override */);
 
   int32_t RegisterEncodeCompleteCallback(
-      EncodedImageCallback* callback) /* override */ {
+      EncodedImageCallback* callback) override {
     callback_ = callback;
     return 0;
   }
 
-  MOCK_METHOD0(Release, int32_t());
+  MOCK_METHOD0(Release, int32_t() /* override */);
 
   void SetRates(const RateControlParameters& parameters) {
     last_set_rates_ = parameters;