| Index: webrtc/api/rtpsenderreceiver_unittest.cc
|
| diff --git a/webrtc/api/rtpsenderreceiver_unittest.cc b/webrtc/api/rtpsenderreceiver_unittest.cc
|
| index 188264e7b2c4ff2c7b6afb64d26d9a80471fff30..24d39bad902fac04ec5d8e2e645351bfe90ece28 100644
|
| --- a/webrtc/api/rtpsenderreceiver_unittest.cc
|
| +++ b/webrtc/api/rtpsenderreceiver_unittest.cc
|
| @@ -42,7 +42,11 @@ namespace webrtc {
|
| // Helper class to test RtpSender/RtpReceiver.
|
| class MockAudioProvider : public AudioProviderInterface {
|
| public:
|
| - ~MockAudioProvider() override {}
|
| + // 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.
|
| + ~MockAudioProvider() /* override */ {}
|
|
|
| MOCK_METHOD2(SetAudioPlayout,
|
| void(uint32_t ssrc,
|
| @@ -57,8 +61,8 @@ class MockAudioProvider : public AudioProviderInterface {
|
| MOCK_METHOD2(SetAudioRtpParameters,
|
| bool(uint32_t ssrc, const RtpParameters&));
|
|
|
| - void SetRawAudioSink(uint32_t,
|
| - rtc::scoped_ptr<AudioSinkInterface> sink) override {
|
| + void SetRawAudioSink(
|
| + uint32_t, rtc::scoped_ptr<AudioSinkInterface> sink) /* override */ {
|
| sink_ = std::move(sink);
|
| }
|
|
|
|
|