| Index: webrtc/api/statscollector_unittest.cc
|
| diff --git a/webrtc/api/statscollector_unittest.cc b/webrtc/api/statscollector_unittest.cc
|
| index 2924c519aafc0e45f2d1d51a5d654d3bc77d3b76..760db0f23112ff824c0789bcfc13a3b968120e8a 100644
|
| --- a/webrtc/api/statscollector_unittest.cc
|
| +++ b/webrtc/api/statscollector_unittest.cc
|
| @@ -67,10 +67,6 @@
|
|
|
| class MockWebRtcSession : public webrtc::WebRtcSession {
|
| 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.
|
| explicit MockWebRtcSession(webrtc::MediaControllerInterface* media_controller)
|
| : WebRtcSession(media_controller,
|
| rtc::Thread::Current(),
|
| @@ -89,7 +85,7 @@
|
|
|
| // Workaround for gmock's inability to cope with move-only return values.
|
| std::unique_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate(
|
| - const std::string& transport_name) /* override */ {
|
| + const std::string& transport_name) override {
|
| return std::unique_ptr<rtc::SSLCertificate>(
|
| GetRemoteSSLCertificate_ReturnsRawPointer(transport_name));
|
| }
|
|
|