Rework chromeos::FlimflamDevice/ServiceClient with CallMethodWithErrorCallback

chromeos/dbus/flimflam_service_client.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_FLIMFLAM_SERVICE_CLIENT_H_
 #define CHROMEOS_DBUS_FLIMFLAM_SERVICE_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 20 matching lines @@
 
 // FlimflamServiceClient is used to communicate with the Flimflam Service
 // service.
 // All methods should be called from the origin thread which initializes the
 // DBusThreadManager instance.
 class CHROMEOS_EXPORT FlimflamServiceClient {
  public:
   typedef FlimflamClientHelper::PropertyChangedHandler PropertyChangedHandler;
   typedef FlimflamClientHelper::VoidCallback VoidCallback;
   typedef FlimflamClientHelper::DictionaryValueCallback DictionaryValueCallback;
+  typedef FlimflamClientHelper::ErrorCallback ErrorCallback;
 
   virtual ~FlimflamServiceClient();
 
   // Factory function, creates a new instance which is owned by the caller.
   // For normal usage, access the singleton via DBusThreadManager::Get().
   static FlimflamServiceClient* Create(DBusClientImplementationType type,
                                        dbus::Bus* bus);
 
   // Sets PropertyChanged signal handler.
   virtual void SetPropertyChangedHandler(
@@ skipping 18 matching lines @@
 
   // Calls ClearProperty method.
   // |callback| is called after the method call succeeds.
   virtual void ClearProperty(const dbus::ObjectPath& service_path,
                              const std::string& name,
                              const VoidCallback& callback) = 0;
 
   // Calls Connect method.
   // |callback| is called after the method call succeeds.
   virtual void Connect(const dbus::ObjectPath& service_path,
-                       const VoidCallback& callback) = 0;
+                       const base::Closure& callback,
+                       const ErrorCallback& error_callback) = 0;
 
   // Calls Disconnect method.
   // |callback| is called after the method call succeeds.
   virtual void Disconnect(const dbus::ObjectPath& service_path,
                           const VoidCallback& callback) = 0;
 
   // Calls Remove method.
   // |callback| is called after the method call succeeds.
   virtual void Remove(const dbus::ObjectPath& service_path,
                       const VoidCallback& callback) = 0;
 
   // Calls ActivateCellularModem method.
   // |callback| is called after the method call succeeds.
   virtual void ActivateCellularModem(const dbus::ObjectPath& service_path,
                                      const std::string& carrier,
                                      const VoidCallback& callback) = 0;
 
  protected:
   // Create() should be used instead.
   FlimflamServiceClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlimflamServiceClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_FLIMFLAM_SERVICE_CLIENT_H_