This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_manager_client.h

Index: chromeos/dbus/shill_manager_client.h
diff --git a/chromeos/dbus/shill_manager_client.h b/chromeos/dbus/shill_manager_client.h
index cc2117498af5158838e8952d8c274a58f66b6392..a0e8b44d0b6f9b8edf0c225d3177c3534344e104 100644
--- a/chromeos/dbus/shill_manager_client.h
+++ b/chromeos/dbus/shill_manager_client.h
@@ -28,13 +28,14 @@ class CHROMEOS_EXPORT ShillManagerClient {
  public:
   typedef ShillClientHelper::PropertyChangedHandler PropertyChangedHandler;
   typedef ShillClientHelper::DictionaryValueCallback DictionaryValueCallback;
+  typedef ShillClientHelper::ErrorCallback ErrorCallback;
 
   virtual ~ShillManagerClient();
 
   // Factory function, creates a new instance which is owned by the caller.
   // For normal usage, access the singleton via DBusThreadManager::Get().
   static ShillManagerClient* Create(DBusClientImplementationType type,
-                                       dbus::Bus* bus);
+                                    dbus::Bus* bus);
 
   // Sets PropertyChanged signal handler.
   virtual void SetPropertyChangedHandler(
@@ -59,32 +60,39 @@ class CHROMEOS_EXPORT ShillManagerClient {
   // |callback| is called after the method call succeeds.
   virtual void SetProperty(const std::string& name,
                            const base::Value& value,
-                           const VoidDBusMethodCallback& callback) = 0;
+                           const base::Closure& callback,
+                           const ErrorCallback& error_callback) = 0;
 
   // Calls RequestScan method.
   // |callback| is called after the method call succeeds.
   virtual void RequestScan(const std::string& type,
-                           const VoidDBusMethodCallback& callback) = 0;
+                           const base::Closure& callback,
+                           const ErrorCallback& error_callback) = 0;
 
   // Calls EnableTechnology method.
   // |callback| is called after the method call succeeds.
   virtual void EnableTechnology(const std::string& type,
-                                const VoidDBusMethodCallback& callback) = 0;
+                                const base::Closure& callback,
+                                const ErrorCallback& error_callback) = 0;
 
   // Calls DisableTechnology method.
   // |callback| is called after the method call succeeds.
   virtual void DisableTechnology(const std::string& type,
-                                 const VoidDBusMethodCallback& callback) = 0;
+                                 const base::Closure& callback,
+                                 const ErrorCallback& error_callback) = 0;
 
   // Calls ConfigureService method.
   // |callback| is called after the method call succeeds.
   virtual void ConfigureService(const base::DictionaryValue& properties,
-                                const VoidDBusMethodCallback& callback) = 0;
+                                const base::Closure& callback,
+                                const ErrorCallback& error_callback) = 0;
 
   // Calls GetService method.
   // |callback| is called after the method call succeeds.
-  virtual void GetService(const base::DictionaryValue& properties,
-                          const ObjectPathDBusMethodCallback& callback) = 0;
+  virtual void GetService(
+      const base::DictionaryValue& properties,
+      const ObjectPathCallbackWithoutStatus& callback,
+      const ErrorCallback& error_callback) = 0;
 
  protected:
   // Create() should be used instead.