This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_ipconfig_client.cc

Index: chromeos/dbus/shill_ipconfig_client.cc
diff --git a/chromeos/dbus/shill_ipconfig_client.cc b/chromeos/dbus/shill_ipconfig_client.cc
index 509696bde5ef9ebbe190f0abe772eda55d8c7bd2..338e695b5ad6b53eee4a5c8e2e675488457af99a 100644
--- a/chromeos/dbus/shill_ipconfig_client.cc
+++ b/chromeos/dbus/shill_ipconfig_client.cc
@@ -24,12 +24,19 @@ class ShillIPConfigClientImpl : public ShillIPConfigClient {
  public:
   explicit ShillIPConfigClientImpl(dbus::Bus* bus);
 
-  // ShillIPConfigClient overrides:
-  virtual void SetPropertyChangedHandler(
+  ////////////////////////////////////
+  // ShillIPConfigClient overrides.
+  virtual void AddPropertyChangedObserver(
       const dbus::ObjectPath& ipconfig_path,
-      const PropertyChangedHandler& handler) OVERRIDE;
-  virtual void ResetPropertyChangedHandler(
-      const dbus::ObjectPath& ipconfig_path) OVERRIDE;
+      PropertyChangedObserver* observer) OVERRIDE {
+    GetHelper(ipconfig_path)->AddPropertyChangedObserver(observer);
+  }
+
+  virtual void RemovePropertyChangedObserver(
+      const dbus::ObjectPath& ipconfig_path,
+      PropertyChangedObserver* observer) OVERRIDE {
+    GetHelper(ipconfig_path)->RemovePropertyChangedObserver(observer);
+  }
   virtual void Refresh(const dbus::ObjectPath& ipconfig_path,
                        const VoidDBusMethodCallback& callback) OVERRIDE;
   virtual void GetProperties(const dbus::ObjectPath& ipconfig_path,
@@ -78,17 +85,6 @@ ShillIPConfigClientImpl::ShillIPConfigClientImpl(dbus::Bus* bus)
       helpers_deleter_(&helpers_) {
 }
 
-void ShillIPConfigClientImpl::SetPropertyChangedHandler(
-    const dbus::ObjectPath& ipconfig_path,
-    const PropertyChangedHandler& handler) {
-  GetHelper(ipconfig_path)->SetPropertyChangedHandler(handler);
-}
-
-void ShillIPConfigClientImpl::ResetPropertyChangedHandler(
-    const dbus::ObjectPath& ipconfig_path) {
-  GetHelper(ipconfig_path)->ResetPropertyChangedHandler();
-}
-
 void ShillIPConfigClientImpl::GetProperties(
     const dbus::ObjectPath& ipconfig_path,
     const DictionaryValueCallback& callback) {
@@ -190,12 +186,12 @@ class ShillIPConfigClientStubImpl : public ShillIPConfigClient {
 
   ///////////////////////////////////////////////
   // ShillIPConfigClient overrides:
-  virtual void SetPropertyChangedHandler(
+  virtual void AddPropertyChangedObserver(
       const dbus::ObjectPath& ipconfig_path,
-      const PropertyChangedHandler& handler) OVERRIDE {}
-
-  virtual void ResetPropertyChangedHandler(
-      const dbus::ObjectPath& ipconfig_path) OVERRIDE {}
+      PropertyChangedObserver* observer) OVERRIDE {}
+  virtual void RemovePropertyChangedObserver(
+      const dbus::ObjectPath& ipconfig_path,
+      PropertyChangedObserver* observer) OVERRIDE {}
 
   virtual void Refresh(const dbus::ObjectPath& ipconfig_path,
                        const VoidDBusMethodCallback& callback) OVERRIDE {}