This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_network_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_network_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 ShillNetworkClient implementation.
 class ShillNetworkClientImpl : public ShillNetworkClient {
  public:
   explicit ShillNetworkClientImpl(dbus::Bus* bus)
       : bus_(bus),
         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,
                                  flimflam::kGetPropertiesFunction);
     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,
                                  flimflam::kGetPropertiesFunction);
     return GetHelper(network_path)->CallDictionaryValueMethodAndBlock(
         &method_call);
   }
 
  private:
   typedef std::map<std::string, ShillClientHelper*> HelperMap;
@@ skipping 20 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ShillNetworkClientImpl);
 };
 
 // A stub implementation of ShillNetworkClient.
 class ShillNetworkClientStubImpl : public ShillNetworkClient {
  public:
   ShillNetworkClientStubImpl() : weak_ptr_factory_(this) {}
 
   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(
         FROM_HERE,
         base::Bind(&ShillNetworkClientStubImpl::PassEmptyDictionaryValue,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback));
   }
 
-  // ShillNetworkClient override.
   virtual base::DictionaryValue* CallGetPropertiesAndBlock(
       const dbus::ObjectPath& network_path) OVERRIDE {
     return new base::DictionaryValue;
   }
 
  private:
   void PassEmptyDictionaryValue(const DictionaryValueCallback& callback) const {
     base::DictionaryValue dictionary;
     callback.Run(DBUS_METHOD_CALL_SUCCESS, dictionary);
   }
@@ skipping 15 matching lines @@
 ShillNetworkClient* ShillNetworkClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new ShillNetworkClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new ShillNetworkClientStubImpl();
 }
 
 }  // namespace chromeos