This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/mock_shill_manager_client.h

Index: chromeos/dbus/mock_shill_manager_client.h
diff --git a/chromeos/dbus/mock_shill_manager_client.h b/chromeos/dbus/mock_shill_manager_client.h
index d38dd0324001d16be886f38086f54b1bb352e9c9..f84417d5b99b6d7b297e1ff71e33694b158d9def 100644
--- a/chromeos/dbus/mock_shill_manager_client.h
+++ b/chromeos/dbus/mock_shill_manager_client.h
@@ -16,24 +16,31 @@ class MockShillManagerClient : public ShillManagerClient {
   MockShillManagerClient();
   virtual ~MockShillManagerClient();
 
-  MOCK_METHOD1(SetPropertyChangedHandler, void(
-      const PropertyChangedHandler& handler));
-  MOCK_METHOD0(ResetPropertyChangedHandler, void());
+  MOCK_METHOD1(AddPropertyChangedObserver,
+               void(PropertyChangedObserver* observer));
+  MOCK_METHOD1(RemovePropertyChangedObserver,
+               void(PropertyChangedObserver* observer));
   MOCK_METHOD1(GetProperties, void(const DictionaryValueCallback& callback));
   MOCK_METHOD0(CallGetPropertiesAndBlock, base::DictionaryValue*());
-  MOCK_METHOD3(SetProperty, void(const std::string& name,
+  MOCK_METHOD4(SetProperty, void(const std::string& name,
                                  const base::Value& value,
-                                 const VoidDBusMethodCallback& callback));
-  MOCK_METHOD2(RequestScan, void(const std::string& type,
-                                 const VoidDBusMethodCallback& callback));
-  MOCK_METHOD2(EnableTechnology, void(const std::string& type,
-                                      const VoidDBusMethodCallback& callback));
-  MOCK_METHOD2(DisableTechnology, void(const std::string& type,
-                                       const VoidDBusMethodCallback& callback));
-  MOCK_METHOD2(ConfigureService, void(const base::DictionaryValue& properties,
-                                      const VoidDBusMethodCallback& callback));
-  MOCK_METHOD2(GetService, void(const base::DictionaryValue& properties,
-                                const ObjectPathDBusMethodCallback& callback));
+                                 const base::Closure& callback,
+                                 const ErrorCallback& error_callback));
+  MOCK_METHOD3(RequestScan, void(const std::string& type,
+                                 const base::Closure& callback,
+                                 const ErrorCallback& error_callback));
+  MOCK_METHOD3(EnableTechnology, void(const std::string& type,
+                                      const base::Closure& callback,
+                                      const ErrorCallback& error_callback));
+  MOCK_METHOD3(DisableTechnology, void(const std::string& type,
+                                       const base::Closure& callback,
+                                       const ErrorCallback& error_callback));
+  MOCK_METHOD3(ConfigureService, void(const base::DictionaryValue& properties,
+                                      const base::Closure& callback,
+                                      const ErrorCallback& error_callback));
+  MOCK_METHOD3(GetService, void(const base::DictionaryValue& properties,
+                                const ObjectPathDBusMethodCallback& callback,
+                                const ErrorCallback& error_callback));
 };
 
 }  // namespace chromeos