Rework chromeos::FlimflamDevice/ServiceClient with CallMethodWithErrorCallback

chromeos/dbus/flimflam_service_client.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 "chromeos/dbus/flimflam_service_client.h"
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 55 matching lines @@
                              const VoidCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamServiceInterface,
                                  flimflam::kClearPropertyFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(name);
     GetHelper(service_path)->CallVoidMethod(&method_call, callback);
   }
 
   // FlimflamServiceClient override.
   virtual void Connect(const dbus::ObjectPath& service_path,
-                       const VoidCallback& callback) OVERRIDE {
+                       const base::Closure& callback,
+                       const ErrorCallback& error_callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamServiceInterface,
                                  flimflam::kConnectFunction);
-    GetHelper(service_path)->CallVoidMethod(&method_call, callback);
+    GetHelper(service_path)->CallVoidMethodWithErrorCallback(
+        &method_call, callback, error_callback);
   }
 
   // FlimflamServiceClient override.
   virtual void Disconnect(const dbus::ObjectPath& service_path,
                           const VoidCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamServiceInterface,
                                  flimflam::kDisconnectFunction);
     GetHelper(service_path)->CallVoidMethod(&method_call, callback);
   }
 
@@ skipping 77 matching lines @@
 
   // FlimflamServiceClient override.
   virtual void ClearProperty(const dbus::ObjectPath& service_path,
                              const std::string& name,
                              const VoidCallback& callback) OVERRIDE {
     PostSuccessVoidCallback(callback);
   }
 
   // FlimflamServiceClient override.
   virtual void Connect(const dbus::ObjectPath& service_path,
-                       const VoidCallback& callback) OVERRIDE {
-    PostSuccessVoidCallback(callback);
+                       const base::Closure& callback,
+                       const ErrorCallback& error_callback) OVERRIDE {
+    MessageLoop::current()->PostTask(FROM_HERE, callback);
   }
 
   // FlimflamServiceClient override.
   virtual void Disconnect(const dbus::ObjectPath& service_path,
                           const VoidCallback& callback) OVERRIDE {
     PostSuccessVoidCallback(callback);
   }
 
   // FlimflamServiceClient override.
   virtual void Remove(const dbus::ObjectPath& service_path,
@@ skipping 36 matching lines @@
 FlimflamServiceClient* FlimflamServiceClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new FlimflamServiceClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new FlimflamServiceClientStubImpl();
 }
 
 }  // namespace chromeos