Revert of Enable -Winconsistent-missing-override flag.

webrtc/test/mock_voice_engine.h

Index: webrtc/test/mock_voice_engine.h
diff --git a/webrtc/test/mock_voice_engine.h b/webrtc/test/mock_voice_engine.h
index b9eb05fb8be234893cfe64f65df001b4480d9b7b..fac088b0e1707d79cc3d3845f9ccc14faaf8a829 100644
--- a/webrtc/test/mock_voice_engine.h
+++ b/webrtc/test/mock_voice_engine.h
@@ -24,10 +24,6 @@
 // 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.
@@ -40,7 +36,7 @@
               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;
@@ -49,8 +45,7 @@
   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));
   }