This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_ipconfig_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/shill_ipconfig_client.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "dbus/values_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 // The ShillIPConfigClient implementation.
 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,
                              const DictionaryValueCallback& callback) OVERRIDE;
   virtual base::DictionaryValue* CallGetPropertiesAndBlock(
       const dbus::ObjectPath& ipconfig_path) OVERRIDE;
   virtual void SetProperty(const dbus::ObjectPath& ipconfig_path,
                            const std::string& name,
                            const base::Value& value,
                            const VoidDBusMethodCallback& callback) OVERRIDE;
@@ skipping 28 matching lines @@
   STLValueDeleter<HelperMap> helpers_deleter_;
 
   DISALLOW_COPY_AND_ASSIGN(ShillIPConfigClientImpl);
 };
 
 ShillIPConfigClientImpl::ShillIPConfigClientImpl(dbus::Bus* bus)
     : 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) {
   dbus::MethodCall method_call(flimflam::kFlimflamIPConfigInterface,
                                flimflam::kGetPropertiesFunction);
   GetHelper(ipconfig_path)->CallDictionaryValueMethod(&method_call, callback);
 }
 
 base::DictionaryValue* ShillIPConfigClientImpl::CallGetPropertiesAndBlock(
     const dbus::ObjectPath& ipconfig_path) {
@@ skipping 81 matching lines @@
 
 // A stub implementation of ShillIPConfigClient.
 class ShillIPConfigClientStubImpl : public ShillIPConfigClient {
  public:
   ShillIPConfigClientStubImpl() : weak_ptr_factory_(this) {}
 
   virtual ~ShillIPConfigClientStubImpl() {}
 
   ///////////////////////////////////////////////
   // 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 {}
 
   virtual void GetProperties(const dbus::ObjectPath& ipconfig_path,
                              const DictionaryValueCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(&ShillIPConfigClientStubImpl::PassProperties,
                               weak_ptr_factory_.GetWeakPtr(),
                               callback));
@@ skipping 55 matching lines @@
 ShillIPConfigClient* ShillIPConfigClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new ShillIPConfigClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new ShillIPConfigClientStubImpl();
 }
 
 }  // namespace chromeos