This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_client_helper.h

Index: chromeos/dbus/shill_client_helper.h
diff --git a/chromeos/dbus/shill_client_helper.h b/chromeos/dbus/shill_client_helper.h
index 84534e090c8acafb4e3babdb4ef4e882cf0818e2..23ba32ff31cb104201df3c5e1d107dd8f2c08e4a 100644
--- a/chromeos/dbus/shill_client_helper.h
+++ b/chromeos/dbus/shill_client_helper.h
@@ -75,7 +75,13 @@ class ShillClientHelper {
 
   // Calls a method with an object path result.
   void CallObjectPathMethod(dbus::MethodCall* method_call,
-                            const ObjectPathDBusMethodCallback& callback);
+                            const ObjectPathCallback& callback);
+
+  // Calls a method with an object path result where there is an error callback.
+  void CallObjectPathMethodWithErrorCallback(
+      dbus::MethodCall* method_call,
+      const ObjectPathCallbackWithoutStatus& callback,
+      const ErrorCallback& error_callback);
 
   // Calls a method with a dictionary value result.
   void CallDictionaryValueMethod(dbus::MethodCall* method_call,
@@ -123,9 +129,15 @@ class ShillClientHelper {
                     dbus::Response* response);
 
   // Handles responses for methods with ObjectPath results.
-  void OnObjectPathMethod(const ObjectPathDBusMethodCallback& callback,
+  void OnObjectPathMethod(const ObjectPathCallback& callback,
                           dbus::Response* response);
 
+  // Handles responses for methods with ObjectPath results.
+  void OnObjectPathMethodWithoutStatus(
+      const ObjectPathCallbackWithoutStatus& callback,
+      const ErrorCallback& error_callback,
+      dbus::Response* response);
+
   // Handles responses for methods with DictionaryValue results.
   void OnDictionaryValueMethod(const DictionaryValueCallback& callback,
                                dbus::Response* response);