Rework chromeos::FlimflamDevice/ServiceClient with CallMethodWithErrorCallback

chromeos/dbus/flimflam_service_client_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "chromeos/dbus/flimflam_client_unittest_base.h"
 #include "chromeos/dbus/flimflam_service_client.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
@@ skipping 120 matching lines @@
                          base::Bind(&ExpectNoResultValue));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
 TEST_F(FlimflamServiceClientTest, Connect) {
   // Create response.
   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();
 }
 
 TEST_F(FlimflamServiceClientTest, Disconnect) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   PrepareForMethodCall(flimflam::kDisconnectFunction,
@@ skipping 32 matching lines @@
                        response.get());
   // Call method.
   client_->ActivateCellularModem(dbus::ObjectPath(kExampleServicePath),
                                  kCarrier,
                                  base::Bind(&ExpectNoResultValue));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
 }  // namespace chromeos