| Index: webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h
|
| diff --git a/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h b/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h
|
| index 2ffb30b708adb1d355dcadaa4510f24b341d34f3..6fafc258ff41962a3cf92e9c5d5582087fdcb427 100644
|
| --- a/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h
|
| +++ b/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h
|
| @@ -22,11 +22,7 @@
|
|
|
| class MockAudioEncoder : public AudioEncoder {
|
| 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.
|
| - ~MockAudioEncoder() /* override */ { Die(); }
|
| + ~MockAudioEncoder() override { Die(); }
|
| MOCK_METHOD0(Die, void());
|
| MOCK_METHOD1(Mark, void(std::string desc));
|
| MOCK_CONST_METHOD0(SampleRateHz, int());
|
|
|