| Index: dbus/mock_object_proxy.h
|
| diff --git a/dbus/mock_object_proxy.h b/dbus/mock_object_proxy.h
|
| index 7c61b47b42802272d40f6f8aadcb6487cd8e2349..66f485ad06ff31c6fa632edde692a5de6808fb41 100644
|
| --- a/dbus/mock_object_proxy.h
|
| +++ b/dbus/mock_object_proxy.h
|
| @@ -29,7 +29,7 @@ class MockObjectProxy : public ObjectProxy {
|
| Response*(MethodCall* method_call,
|
| int timeout_ms,
|
| ScopedDBusError* error));
|
| - virtual scoped_ptr<Response> CallMethodAndBlockWithErrorDetails(
|
| + scoped_ptr<Response> CallMethodAndBlockWithErrorDetails(
|
| MethodCall* method_call,
|
| int timeout_ms,
|
| ScopedDBusError* error) override {
|
| @@ -38,8 +38,8 @@ class MockObjectProxy : public ObjectProxy {
|
| }
|
| MOCK_METHOD2(MockCallMethodAndBlock, Response*(MethodCall* method_call,
|
| int timeout_ms));
|
| - virtual scoped_ptr<Response> CallMethodAndBlock(MethodCall* method_call,
|
| - int timeout_ms) override {
|
| + scoped_ptr<Response> CallMethodAndBlock(MethodCall* method_call,
|
| + int timeout_ms) override {
|
| return scoped_ptr<Response>(MockCallMethodAndBlock(method_call,
|
| timeout_ms));
|
| }
|
| @@ -58,7 +58,7 @@ class MockObjectProxy : public ObjectProxy {
|
| MOCK_METHOD0(Detach, void());
|
|
|
| protected:
|
| - virtual ~MockObjectProxy();
|
| + ~MockObjectProxy() override;
|
| };
|
|
|
| } // namespace dbus
|
|
|