This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_network_client.cc

Index: chromeos/dbus/shill_network_client.cc
diff --git a/chromeos/dbus/shill_network_client.cc b/chromeos/dbus/shill_network_client.cc
index dd70ebbde29e473e0e7ae9cbeeb45d239e2e0acc..818b8d494cb86b1730bab9af641f3441942ad6b9 100644
--- a/chromeos/dbus/shill_network_client.cc
+++ b/chromeos/dbus/shill_network_client.cc
@@ -27,20 +27,20 @@ class ShillNetworkClientImpl : public ShillNetworkClient {
         helpers_deleter_(&helpers_) {
   }
 
-  // ShillNetworkClient override.
-  virtual void SetPropertyChangedHandler(
+  //////////////////////////////////////
+  // ShillNetworkClient overrides.
+  virtual void AddPropertyChangedObserver(
       const dbus::ObjectPath& network_path,
-      const PropertyChangedHandler& handler) OVERRIDE {
-    GetHelper(network_path)->SetPropertyChangedHandler(handler);
+      PropertyChangedObserver* observer) OVERRIDE {
+    GetHelper(network_path)->AddPropertyChangedObserver(observer);
   }
 
-  // ShillNetworkClient override.
-  virtual void ResetPropertyChangedHandler(
-      const dbus::ObjectPath& network_path) OVERRIDE {
-    GetHelper(network_path)->ResetPropertyChangedHandler();
+  virtual void RemovePropertyChangedObserver(
+      const dbus::ObjectPath& network_path,
+      PropertyChangedObserver* observer) OVERRIDE {
+    GetHelper(network_path)->RemovePropertyChangedObserver(observer);
   }
 
-  // ShillNetworkClient override.
   virtual void GetProperties(const dbus::ObjectPath& network_path,
                              const DictionaryValueCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamNetworkInterface,
@@ -48,7 +48,6 @@ class ShillNetworkClientImpl : public ShillNetworkClient {
     GetHelper(network_path)->CallDictionaryValueMethod(&method_call, callback);
   }
 
-  // ShillNetworkClient override.
   virtual base::DictionaryValue* CallGetPropertiesAndBlock(
       const dbus::ObjectPath& network_path) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamNetworkInterface,
@@ -89,16 +88,16 @@ class ShillNetworkClientStubImpl : public ShillNetworkClient {
 
   virtual ~ShillNetworkClientStubImpl() {}
 
-  // ShillNetworkClient override.
-  virtual void SetPropertyChangedHandler(
+  /////////////////////////////////////
+  // ShillNetworkClient overrides.
+  virtual void AddPropertyChangedObserver(
       const dbus::ObjectPath& network_path,
-      const PropertyChangedHandler& handler) OVERRIDE {}
+      PropertyChangedObserver* observer) OVERRIDE {}
 
-  // ShillNetworkClient override.
-  virtual void ResetPropertyChangedHandler(
-      const dbus::ObjectPath& network_path) OVERRIDE {}
+  virtual void RemovePropertyChangedObserver(
+      const dbus::ObjectPath& network_path,
+      PropertyChangedObserver* observer) OVERRIDE {}
 
-  // ShillNetworkClient override.
   virtual void GetProperties(const dbus::ObjectPath& network_path,
                              const DictionaryValueCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
@@ -108,7 +107,6 @@ class ShillNetworkClientStubImpl : public ShillNetworkClient {
                    callback));
   }
 
-  // ShillNetworkClient override.
   virtual base::DictionaryValue* CallGetPropertiesAndBlock(
       const dbus::ObjectPath& network_path) OVERRIDE {
     return new base::DictionaryValue;