| Index: chromeos/dbus/blocking_method_caller_unittest.cc
|
| diff --git a/chromeos/dbus/blocking_method_caller_unittest.cc b/chromeos/dbus/blocking_method_caller_unittest.cc
|
| index f126408134c9d938c508fc29d2fc02b5b982b623..80898325e925c82e5985820e3dede3d03c499011 100644
|
| --- a/chromeos/dbus/blocking_method_caller_unittest.cc
|
| +++ b/chromeos/dbus/blocking_method_caller_unittest.cc
|
| @@ -60,9 +60,10 @@ class BlockingMethodCallerTest : public testing::Test {
|
|
|
| // Set an expectation so mock_proxy's CallMethodAndBlock() will use
|
| // CreateMockProxyResponse() to return responses.
|
| - EXPECT_CALL(*mock_proxy_.get(), MockCallMethodAndBlock(_, _))
|
| + EXPECT_CALL(*mock_proxy_.get(),
|
| + MockCallMethodAndBlockWithErrorDetails(_, _, _))
|
| .WillRepeatedly(
|
| - Invoke(this, &BlockingMethodCallerTest::CreateMockProxyResponse));
|
| + Invoke(this, &BlockingMethodCallerTest::CreateMockProxyResponse));
|
|
|
| // Set an expectation so mock_bus's GetObjectProxy() for the given
|
| // service name and the object path will return mock_proxy_.
|
| @@ -91,7 +92,8 @@ class BlockingMethodCallerTest : public testing::Test {
|
| // Returns a response for the given method call. Used to implement
|
| // CallMethodAndBlock() for |mock_proxy_|.
|
| dbus::Response* CreateMockProxyResponse(dbus::MethodCall* method_call,
|
| - int timeout_ms) {
|
| + int timeout_ms,
|
| + dbus::ScopedDBusError* error) {
|
| if (method_call->GetInterface() == "org.chromium.TestInterface" &&
|
| method_call->GetMember() == "Echo") {
|
| dbus::MessageReader reader(method_call);
|
|
|