Revert of Enable -Winconsistent-missing-override flag.

webrtc/test/mock_voice_engine.h

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_AUDIO_MOCK_VOICE_ENGINE_H_
 #define WEBRTC_AUDIO_MOCK_VOICE_ENGINE_H_
 
 #include <memory>
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "webrtc/test/mock_voe_channel_proxy.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"
 
 namespace webrtc {
 namespace test {
 
 // NOTE: This class inherits from VoiceEngineImpl so that its clients will be
 // able to get the various interfaces as usual, via T::GetInterface().
 class MockVoiceEngine : public VoiceEngineImpl {
  public:
-  // TODO(nisse): Valid overrides commented out, because the gmock
-  // methods don't use any override declarations, and we want to avoid
-  // warnings from -Winconsistent-missing-override. See
-  // http://crbug.com/428099.
   MockVoiceEngine() : VoiceEngineImpl(new Config(), true) {
     // Increase ref count so this object isn't automatically deleted whenever
     // interfaces are Release():d.
     ++_ref_count;
     // We add this default behavior to make the mock easier to use in tests. It
     // will create a NiceMock of a voe::ChannelProxy.
     ON_CALL(*this, ChannelProxyFactory(testing::_))
         .WillByDefault(
             testing::Invoke([](int channel_id) {
               return new testing::NiceMock<MockVoEChannelProxy>();
             }));
   }
-  ~MockVoiceEngine() /* override */ {
+  ~MockVoiceEngine() override {
     // Decrease ref count before base class d-tor is called; otherwise it will
     // trigger an assertion.
     --_ref_count;
   }
   // Allows injecting a ChannelProxy factory.
   MOCK_METHOD1(ChannelProxyFactory, voe::ChannelProxy*(int channel_id));
 
   // VoiceEngineImpl
-  std::unique_ptr<voe::ChannelProxy> GetChannelProxy(
-      int channel_id) /* override */ {
+  std::unique_ptr<voe::ChannelProxy> GetChannelProxy(int channel_id) override {
     return std::unique_ptr<voe::ChannelProxy>(ChannelProxyFactory(channel_id));
   }
 
   // VoEAudioProcessing
   MOCK_METHOD2(SetNsStatus, int(bool enable, NsModes mode));
   MOCK_METHOD2(GetNsStatus, int(bool& enabled, NsModes& mode));
   MOCK_METHOD2(SetAgcStatus, int(bool enable, AgcModes mode));
   MOCK_METHOD2(GetAgcStatus, int(bool& enabled, AgcModes& mode));
   MOCK_METHOD1(SetAgcConfig, int(AgcConfig config));
   MOCK_METHOD1(GetAgcConfig, int(AgcConfig& config));
@@ skipping 255 matching lines @@
                int(int channel, unsigned& level));
   MOCK_METHOD2(SetChannelOutputVolumeScaling, int(int channel, float scaling));
   MOCK_METHOD2(GetChannelOutputVolumeScaling, int(int channel, float& scaling));
   MOCK_METHOD3(SetOutputVolumePan, int(int channel, float left, float right));
   MOCK_METHOD3(GetOutputVolumePan, int(int channel, float& left, float& right));
 };
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_AUDIO_MOCK_VOICE_ENGINE_H_