| Index: webrtc/modules/utility/include/mock/mock_process_thread.h
|
| diff --git a/webrtc/modules/utility/include/mock/mock_process_thread.h b/webrtc/modules/utility/include/mock/mock_process_thread.h
|
| index 621fcee818249bef6fdd221ca4f37d49c5b5ef0d..3d39307ba4ddd5838ccf28b6dd4ec9ab45391a49 100644
|
| --- a/webrtc/modules/utility/include/mock/mock_process_thread.h
|
| +++ b/webrtc/modules/utility/include/mock/mock_process_thread.h
|
| @@ -21,10 +21,6 @@
|
|
|
| class MockProcessThread : public ProcessThread {
|
| 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.
|
| MOCK_METHOD0(Start, void());
|
| MOCK_METHOD0(Stop, void());
|
| MOCK_METHOD1(WakeUp, void(Module* module));
|
| @@ -35,7 +31,7 @@
|
| // MOCK_METHOD1 gets confused with mocking this method, so we work around it
|
| // by overriding the method from the interface and forwarding the call to a
|
| // mocked, simpler method.
|
| - void PostTask(std::unique_ptr<ProcessTask> task) /* override */ {
|
| + void PostTask(std::unique_ptr<ProcessTask> task) override {
|
| PostTask(task.get());
|
| }
|
| };
|
|
|