1 files changed, 15 insertions, 21 deletions

diff --git a/brillo/dbus/dbus_method_invoker_test.cc b/brillo/dbus/dbus_method_invoker_test.cc
index 9e6600a..c0c681b 100644
--- a/brillo/dbus/dbus_method_invoker_test.cc
+++ b/brillo/dbus/dbus_method_invoker_test.cc
@@ -83,18 +83,16 @@ class DBusMethodInvokerTest : public testing::Test {
                 GetObjectProxy(kTestServiceName, dbus::ObjectPath(kTestPath)))
         .WillRepeatedly(Return(mock_object_proxy_.get()));
     int def_timeout_ms = dbus::ObjectProxy::TIMEOUT_USE_DEFAULT;
-    EXPECT_CALL(
-        *mock_object_proxy_,
-        MIGRATE_MockCallMethodAndBlockWithErrorDetails(_, def_timeout_ms, _))
+    EXPECT_CALL(*mock_object_proxy_,
+                CallMethodAndBlockWithErrorDetails(_, def_timeout_ms, _))
         .WillRepeatedly(Invoke(this, &DBusMethodInvokerTest::CreateResponse));
   }
 
   void TearDown() override { bus_ = nullptr; }
 
-  MIGRATE_WrapObjectProxyResponseType(Response)
-      CreateResponse(dbus::MethodCall* method_call,
-                     int /* timeout_ms */,
-                     dbus::ScopedDBusError* dbus_error) {
+  std::unique_ptr<Response> CreateResponse(dbus::MethodCall* method_call,
+                                           int /* timeout_ms */,
+                                           dbus::ScopedDBusError* dbus_error) {
     if (method_call->GetInterface() == kTestInterface) {
       if (method_call->GetMember() == kTestMethod1) {
         MessageReader reader(method_call);
@@ -105,12 +103,12 @@ class DBusMethodInvokerTest : public testing::Test {
           auto response = Response::CreateEmpty();
           MessageWriter writer(response.get());
           writer.AppendString(std::to_string(v1 + v2));
-          return MIGRATE_WrapObjectProxyResponseConversion(response);
+          return response;
         }
       } else if (method_call->GetMember() == kTestMethod2) {
         method_call->SetSerial(123);
         dbus_set_error(dbus_error->get(), "org.MyError", "My error message");
-        return MIGRATE_WrapObjectProxyResponseEmpty;
+        return std::unique_ptr<dbus::Response>();
       } else if (method_call->GetMember() == kTestMethod3) {
         MessageReader reader(method_call);
         dbus_utils_test::TestMessage msg;
@@ -118,7 +116,7 @@ class DBusMethodInvokerTest : public testing::Test {
           auto response = Response::CreateEmpty();
           MessageWriter writer(response.get());
           AppendValueToWriter(&writer, msg);
-          return MIGRATE_WrapObjectProxyResponseConversion(response);
+          return response;
         }
       } else if (method_call->GetMember() == kTestMethod4) {
         method_call->SetSerial(123);
@@ -128,13 +126,13 @@ class DBusMethodInvokerTest : public testing::Test {
           auto response = Response::CreateEmpty();
           MessageWriter writer(response.get());
           writer.AppendFileDescriptor(fd.get());
-          return MIGRATE_WrapObjectProxyResponseConversion(response);
+          return response;
         }
       }
     }
 
     LOG(ERROR) << "Unexpected method call: " << method_call->ToString();
-    return MIGRATE_WrapObjectProxyResponseEmpty;
+    return std::unique_ptr<dbus::Response>();
   }
 
   std::string CallTestMethod(int v1, int v2) {
@@ -245,7 +243,7 @@ class AsyncDBusMethodInvokerTest : public testing::Test {
         .WillRepeatedly(Return(mock_object_proxy_.get()));
     int def_timeout_ms = dbus::ObjectProxy::TIMEOUT_USE_DEFAULT;
     EXPECT_CALL(*mock_object_proxy_,
-                MIGRATE_CallMethodWithErrorCallback(_, def_timeout_ms, _, _))
+                DoCallMethodWithErrorCallback(_, def_timeout_ms, _, _))
         .WillRepeatedly(Invoke(this, &AsyncDBusMethodInvokerTest::HandleCall));
   }
 
@@ -253,10 +251,8 @@ class AsyncDBusMethodInvokerTest : public testing::Test {
 
   void HandleCall(dbus::MethodCall* method_call,
                   int /* timeout_ms */,
-                  dbus::ObjectProxy::ResponseCallback
-                      MIGRATE_WrapObjectProxyCallback(success_callback),
-                  dbus::ObjectProxy::ErrorCallback
-                      MIGRATE_WrapObjectProxyCallback(error_callback)) {
+                  dbus::ObjectProxy::ResponseCallback* success_callback,
+                  dbus::ObjectProxy::ErrorCallback* error_callback) {
     if (method_call->GetInterface() == kTestInterface) {
       if (method_call->GetMember() == kTestMethod1) {
         MessageReader reader(method_call);
@@ -267,16 +263,14 @@ class AsyncDBusMethodInvokerTest : public testing::Test {
           auto response = Response::CreateEmpty();
           MessageWriter writer(response.get());
           writer.AppendString(std::to_string(v1 + v2));
-          std::move(MIGRATE_WrapObjectProxyCallback(success_callback))
-              .Run(response.get());
+          std::move(*success_callback).Run(response.get());
         }
         return;
       } else if (method_call->GetMember() == kTestMethod2) {
         method_call->SetSerial(123);
         auto error_response = dbus::ErrorResponse::FromMethodCall(
             method_call, "org.MyError", "My error message");
-        std::move(MIGRATE_WrapObjectProxyCallback(error_callback))
-            .Run(error_response.get());
+        std::move(*error_callback).Run(error_response.get());
         return;
       }
     }