Rework chromeos::FlimflamDevice/ServiceClient with CallMethodWithErrorCallback

chromeos/dbus/flimflam_service_client_unittest.cc

Index: chromeos/dbus/flimflam_service_client_unittest.cc
diff --git a/chromeos/dbus/flimflam_service_client_unittest.cc b/chromeos/dbus/flimflam_service_client_unittest.cc
index 92b802ed239c7a5b7630abb1d2143f11d7582d30..dafea40903ace9d492c7a1a67e99bb66044c78ff 100644
--- a/chromeos/dbus/flimflam_service_client_unittest.cc
+++ b/chromeos/dbus/flimflam_service_client_unittest.cc
@@ -138,12 +138,17 @@ TEST_F(FlimflamServiceClientTest, Connect) {
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
+  MockClosure mock_closure;
+  MockErrorCallback mock_error_callback;
   PrepareForMethodCall(flimflam::kConnectFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
+  EXPECT_CALL(mock_closure, Run()).Times(1);
   // Call method.
   client_->Connect(dbus::ObjectPath(kExampleServicePath),
-                   base::Bind(&ExpectNoResultValue));
+                   mock_closure.GetCallback(),
+                   mock_error_callback.GetCallback());
+
   // Run the message loop.
   message_loop_.RunAllPending();
 }