Rework chromeos::FlimflamDevice/ServiceClient with CallMethodWithErrorCallback

chromeos/dbus/flimflam_device_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_DEVICE_CLIENT_H_
 #define CHROMEOS_DBUS_FLIMFLAM_DEVICE_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 20 matching lines @@
 
 // FlimflamDeviceClient is used to communicate with the Flimflam Device service.
 // All methods should be called from the origin thread which initializes the
 // DBusThreadManager instance.
 class CHROMEOS_EXPORT FlimflamDeviceClient {
  public:
   typedef FlimflamClientHelper::PropertyChangedHandler PropertyChangedHandler;
   typedef FlimflamClientHelper::VoidCallback VoidCallback;
   typedef FlimflamClientHelper::ObjectPathCallback ObjectPathCallback;
   typedef FlimflamClientHelper::DictionaryValueCallback DictionaryValueCallback;
+  typedef FlimflamClientHelper::ErrorCallback ErrorCallback;
 
   virtual ~FlimflamDeviceClient();
 
   // Factory function, creates a new instance which is owned by the caller.
   // For normal usage, access the singleton via DBusThreadManager::Get().
   static FlimflamDeviceClient* Create(DBusClientImplementationType type,
                                       dbus::Bus* bus);
 
   // Sets PropertyChanged signal handler.
   virtual void SetPropertyChangedHandler(
@@ skipping 48 matching lines @@
   // TODO(hashimoto): Refactor CrosAddIPConfig and remove this method.
   virtual dbus::ObjectPath CallAddIPConfigAndBlock(
       const dbus::ObjectPath& device_path,
       const std::string& method) = 0;
 
   // Calls RequirePin method.
   // |callback| is called after the method call finishes.
   virtual void RequirePin(const dbus::ObjectPath& device_path,
                           const std::string& pin,
                           bool require,
-                          const VoidCallback& callback) = 0;
+                          const base::Closure& callback,
+                          const ErrorCallback& error_callback) = 0;
 
   // Calls EnterPin method.
   // |callback| is called after the method call finishes.
   virtual void EnterPin(const dbus::ObjectPath& device_path,
                         const std::string& pin,
-                        const VoidCallback& callback) = 0;
+                        const base::Closure& callback,
+                        const ErrorCallback& error_callback) = 0;
 
   // Calls UnblockPin method.
   // |callback| is called after the method call finishes.
   virtual void UnblockPin(const dbus::ObjectPath& device_path,
                           const std::string& puk,
                           const std::string& pin,
-                          const VoidCallback& callback) = 0;
+                          const base::Closure& callback,
+                          const ErrorCallback& error_callback) = 0;
 
   // Calls ChangePin method.
   // |callback| is called after the method call finishes.
   virtual void ChangePin(const dbus::ObjectPath& device_path,
                          const std::string& old_pin,
                          const std::string& new_pin,
-                         const VoidCallback& callback) = 0;
+                         const base::Closure& callback,
+                         const ErrorCallback& error_callback) = 0;
 
   // Calls Register method.
   // |callback| is called after the method call finishes.
   virtual void Register(const dbus::ObjectPath& device_path,
                         const std::string& network_id,
-                        const VoidCallback& callback) = 0;
+                        const base::Closure& callback,
+                        const ErrorCallback& error_callback) = 0;
 
  protected:
   // Create() should be used instead.
   FlimflamDeviceClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlimflamDeviceClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_FLIMFLAM_DEVICE_CLIENT_H_