From a9952cb0c40876031a652b467b813dfcb80d5f2b Mon Sep 17 00:00:00 2001
From: Elad Alon <eladalon@webrtc.org>
Date: Tue, 11 Jun 2019 19:03:16 +0200
Subject: [PATCH] Uncomment "override" in simulcast_encoder_adapter_unittest.cc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc
index 6bf99a520a..fd5e5ffc50 100644
--- a/media/engine/simulcast_encoder_adapter_unittest.cc
+++ b/media/engine/simulcast_encoder_adapter_unittest.cc
@@ -192,7 +192,7 @@ class MockVideoEncoder : public VideoEncoder {
   // 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 @@ class MockVideoEncoder : public VideoEncoder {
               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;