This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/mock_shill_profile_client.h

Index: chromeos/dbus/mock_shill_profile_client.h
diff --git a/chromeos/dbus/mock_shill_profile_client.h b/chromeos/dbus/mock_shill_profile_client.h
index bd0125dc041c02abee99994ed15c3f4dc3202fc3..fd8eaa3734d1d3750500b478b42dd78192cba886 100644
--- a/chromeos/dbus/mock_shill_profile_client.h
+++ b/chromeos/dbus/mock_shill_profile_client.h
@@ -17,19 +17,25 @@ class MockShillProfileClient : public ShillProfileClient {
   MockShillProfileClient();
   virtual ~MockShillProfileClient();
 
-  MOCK_METHOD2(SetPropertyChangedHandler,
+  MOCK_METHOD2(AddPropertyChangedObserver,
                void(const dbus::ObjectPath& profile_path,
-                    const PropertyChangedHandler& handler));
-  MOCK_METHOD1(ResetPropertyChangedHandler,
-               void(const dbus::ObjectPath& profile_path));
-  MOCK_METHOD2(GetProperties, void(const dbus::ObjectPath& profile_path,
-                                   const DictionaryValueCallback& callback));
-  MOCK_METHOD3(GetEntry, void(const dbus::ObjectPath& profile_path,
-                              const std::string& entry_path,
-                              const DictionaryValueCallback& callback));
-  MOCK_METHOD3(DeleteEntry, void(const dbus::ObjectPath& profile_path,
+                    ShillClientHelper::PropertyChangedObserver* observer));
+  MOCK_METHOD2(RemovePropertyChangedObserver,
+               void(const dbus::ObjectPath& profile_path,
+                    ShillClientHelper::PropertyChangedObserver* observer));
+  MOCK_METHOD3(GetProperties, void(
+      const dbus::ObjectPath& profile_path,
+      const DictionaryValueCallbackWithoutStatus& callback,
+      const ErrorCallback& error_callback));
+  MOCK_METHOD4(GetEntry, void(
+      const dbus::ObjectPath& profile_path,
+      const std::string& entry_path,
+      const DictionaryValueCallbackWithoutStatus& callback,
+      const ErrorCallback& error_callback));
+  MOCK_METHOD4(DeleteEntry, void(const dbus::ObjectPath& profile_path,
                                  const std::string& entry_path,
-                                 const VoidDBusMethodCallback& callback));
+                                 const base::Closure& callback,
+                                 const ErrorCallback& error_callback));
 };
 
 }  // namespace chromeos