dbus: Let ObjectProxy::CallMethod() take OnceCallback

Currently, ObjectProxy::CallMethod is implemented by creating ErrorCallback from ResponseCallback.
This does not work with OnceCallback because it's not allowed to create two callbacks from one OnceCallback.
To solve this, this change introduces CallMethodCallbackInternal to ObjectProxy which takes either Response* or ErrorResponse*, and dispatches the response to the appropriate callback.

Also, Gmock does not allow directly mocking functions which take move-only
arguments.
https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#mocking-methods-that-use-move-only-types
To workaround this, add DoCallMethod to MockObjetProxy.

BUG=740015
TEST=build

Change-Id: I1a98b5fd1d6d70f69674102a3d66bcec0c13214c
Reviewed-on: https://chromium-review.googlesource.com/578541
Commit-Queue: Ryo Hashimoto <hashimoto@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Satoru Takabayashi <satorux@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488615}

CrOS-Libchrome-Original-Commit: 2a363a8cb1791cb18a4a64d52afde428e92ba73e

1 files changed, 15 insertions, 0 deletions

diff --git a/dbus/mock_object_proxy.cc b/dbus/mock_object_proxy.cc
index 7e26f01ba5..616fb02dc2 100644
--- a/dbus/mock_object_proxy.cc
+++ b/dbus/mock_object_proxy.cc
@@ -15,4 +15,19 @@ MockObjectProxy::MockObjectProxy(Bus* bus,
 MockObjectProxy::~MockObjectProxy() {
 }
 
+void MockObjectProxy::CallMethod(MethodCall* method_call,
+                                 int timeout_ms,
+                                 ResponseCallback callback) {
+  DoCallMethod(method_call, timeout_ms, &callback);
+}
+
+void MockObjectProxy::CallMethodWithErrorCallback(
+    MethodCall* method_call,
+    int timeout_ms,
+    ResponseCallback callback,
+    ErrorCallback error_callback) {
+  DoCallMethodWithErrorCallback(method_call, timeout_ms, &callback,
+                                &error_callback);
+}
+
 }  // namespace dbus