This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/mock_shill_service_client.h

Index: chromeos/dbus/mock_shill_service_client.h
diff --git a/chromeos/dbus/mock_shill_service_client.h b/chromeos/dbus/mock_shill_service_client.h
index 1b3c61e11052b3b4897a13c44dbeddd773fbca84..701ca3f3297e802ed98627d1eb21e8738fb92c8e 100644
--- a/chromeos/dbus/mock_shill_service_client.h
+++ b/chromeos/dbus/mock_shill_service_client.h
@@ -17,31 +17,37 @@ class MockShillServiceClient : public ShillServiceClient {
   MockShillServiceClient();
   virtual ~MockShillServiceClient();
 
-  MOCK_METHOD2(SetPropertyChangedHandler,
+  MOCK_METHOD2(AddPropertyChangedObserver,
                void(const dbus::ObjectPath& service_path,
-                    const PropertyChangedHandler& handler));
-  MOCK_METHOD1(ResetPropertyChangedHandler,
-               void(const dbus::ObjectPath& service_path));
+                    PropertyChangedObserver* observer));
+  MOCK_METHOD2(RemovePropertyChangedObserver,
+               void(const dbus::ObjectPath& service_path,
+                    PropertyChangedObserver* observer));
   MOCK_METHOD2(GetProperties, void(const dbus::ObjectPath& service_path,
                                    const DictionaryValueCallback& callback));
-  MOCK_METHOD4(SetProperty, void(const dbus::ObjectPath& service_path,
+  MOCK_METHOD5(SetProperty, void(const dbus::ObjectPath& service_path,
                                  const std::string& name,
                                  const base::Value& value,
-                                 const VoidDBusMethodCallback& callback));
-  MOCK_METHOD3(ClearProperty, void(const dbus::ObjectPath& service_path,
+                                 const base::Closure& callback,
+                                 const ErrorCallback& error_callback));
+  MOCK_METHOD4(ClearProperty, void(const dbus::ObjectPath& service_path,
                                    const std::string& name,
-                                   const VoidDBusMethodCallback& callback));
+                                   const base::Closure& callback,
+                                   const ErrorCallback& error_callback));
   MOCK_METHOD3(Connect, void(const dbus::ObjectPath& service_path,
                              const base::Closure& callback,
                              const ErrorCallback& error_callback));
-  MOCK_METHOD2(Disconnect, void(const dbus::ObjectPath& service_path,
-                                const VoidDBusMethodCallback& callback));
-  MOCK_METHOD2(Remove, void(const dbus::ObjectPath& service_path,
-                            const VoidDBusMethodCallback& callback));
-  MOCK_METHOD3(ActivateCellularModem,
+  MOCK_METHOD3(Disconnect, void(const dbus::ObjectPath& service_path,
+                                const base::Closure& callback,
+                                const ErrorCallback& error_callback));
+  MOCK_METHOD3(Remove, void(const dbus::ObjectPath& service_path,
+                            const base::Closure& callback,
+                            const ErrorCallback& error_callback));
+  MOCK_METHOD4(ActivateCellularModem,
                void(const dbus::ObjectPath& service_path,
                     const std::string& carrier,
-                    const VoidDBusMethodCallback& callback));
+                    const base::Closure& callback,
+                    const ErrorCallback& error_callback));
   MOCK_METHOD2(CallActivateCellularModemAndBlock,
                bool(const dbus::ObjectPath& service_path,
                     const std::string& carrier));