| Index: dbus/mock_object_proxy.h
|
| diff --git a/dbus/mock_object_proxy.h b/dbus/mock_object_proxy.h
|
| index fcad8607248607a7dba61ad838bb2b019cc52224..b5900ad32e3885b70fb389fc12378ae604914c15 100644
|
| --- a/dbus/mock_object_proxy.h
|
| +++ b/dbus/mock_object_proxy.h
|
| @@ -25,6 +25,17 @@ class MockObjectProxy : public ObjectProxy {
|
| // uncopyable. This is a workaround which defines |MockCallMethodAndBlock| as
|
| // a mock method and makes |CallMethodAndBlock| call the mocked method.
|
| // Use |MockCallMethodAndBlock| for setting/testing expectations.
|
| + MOCK_METHOD3(MockCallMethodAndBlockWithErrorDetails,
|
| + Response*(MethodCall* method_call,
|
| + int timeout_ms,
|
| + ScopedDBusError* error));
|
| + virtual scoped_ptr<Response> CallMethodAndBlockWithErrorDetails(
|
| + MethodCall* method_call,
|
| + int timeout_ms,
|
| + ScopedDBusError* error) OVERRIDE {
|
| + return scoped_ptr<Response>(
|
| + MockCallMethodAndBlockWithErrorDetails(method_call, timeout_ms, error));
|
| + }
|
| MOCK_METHOD2(MockCallMethodAndBlock, Response*(MethodCall* method_call,
|
| int timeout_ms));
|
| virtual scoped_ptr<Response> CallMethodAndBlock(MethodCall* method_call,
|
|
|