This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_device_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_device_client.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/values.h"
@@ skipping 11 matching lines @@
 // The ShillDeviceClient implementation.
 class ShillDeviceClientImpl : public ShillDeviceClient {
  public:
   explicit ShillDeviceClientImpl(dbus::Bus* bus)
       : bus_(bus),
         helpers_deleter_(&helpers_) {
   }
 
   ///////////////////////////////////////
   // ShillDeviceClient overrides.
-  virtual void SetPropertyChangedHandler(
+  virtual void AddPropertyChangedObserver(
       const dbus::ObjectPath& device_path,
-      const PropertyChangedHandler& handler) OVERRIDE {
-    GetHelper(device_path)->SetPropertyChangedHandler(handler);
+      PropertyChangedObserver* observer) OVERRIDE {
+    GetHelper(device_path)->AddPropertyChangedObserver(observer);
   }
 
-  virtual void ResetPropertyChangedHandler(
-      const dbus::ObjectPath& device_path) OVERRIDE {
-    GetHelper(device_path)->ResetPropertyChangedHandler();
+  virtual void RemovePropertyChangedObserver(
+      const dbus::ObjectPath& device_path,
+      PropertyChangedObserver* observer) OVERRIDE {
+    GetHelper(device_path)->RemovePropertyChangedObserver(observer);
   }
 
   virtual void GetProperties(const dbus::ObjectPath& device_path,
                              const DictionaryValueCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamDeviceInterface,
                                  flimflam::kGetPropertiesFunction);
     GetHelper(device_path)->CallDictionaryValueMethod(&method_call, callback);
   }
 
   virtual base::DictionaryValue* CallGetPropertiesAndBlock(
       const dbus::ObjectPath& device_path) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamDeviceInterface,
                                  flimflam::kGetPropertiesFunction);
     return GetHelper(device_path)->CallDictionaryValueMethodAndBlock(
         &method_call);
   }
 
   virtual void ProposeScan(const dbus::ObjectPath& device_path,
                            const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamDeviceInterface,
                                  flimflam::kProposeScanFunction);
     GetHelper(device_path)->CallVoidMethod(&method_call, callback);
   }
 
   virtual void SetProperty(const dbus::ObjectPath& device_path,
                            const std::string& name,
                            const base::Value& value,
-                           const VoidDBusMethodCallback& callback) OVERRIDE {
+                           const base::Closure& callback,
+                           const ErrorCallback& error_callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamDeviceInterface,
                                  flimflam::kSetPropertyFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(name);
     ShillClientHelper::AppendValueDataAsVariant(&writer, value);
-    GetHelper(device_path)->CallVoidMethod(&method_call, callback);
+    GetHelper(device_path)->CallVoidMethodWithErrorCallback(&method_call,
+                                                            callback,
+                                                            error_callback);
   }
 
   virtual void ClearProperty(const dbus::ObjectPath& device_path,
                              const std::string& name,
                              const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamDeviceInterface,
                                  flimflam::kClearPropertyFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(name);
     GetHelper(device_path)->CallVoidMethod(&method_call, callback);
@@ skipping 143 matching lines @@
         base::Value::CreateStringValue(":stub.0"));
     cellular_properties->SetWithoutPathExpansion(
         flimflam::kDBusObjectProperty,
         base::Value::CreateStringValue(
                 "/org/freedesktop/ModemManager1/stub/0"));
     stub_devices_.Set(kStubCellular2, cellular_properties);
   }
 
   virtual ~ShillDeviceClientStubImpl() {}
 
-  // ShillDeviceClient override.
-  virtual void SetPropertyChangedHandler(
+  ///////////////////////////////////
+  // ShillDeviceClient overrides.
+  virtual void AddPropertyChangedObserver(
       const dbus::ObjectPath& device_path,
-      const PropertyChangedHandler& handler) OVERRIDE {}
+      PropertyChangedObserver* observer) OVERRIDE {}
 
-  // ShillDeviceClient override.
-  virtual void ResetPropertyChangedHandler(
-      const dbus::ObjectPath& device_path) OVERRIDE {}
+  virtual void RemovePropertyChangedObserver(
+      const dbus::ObjectPath& device_path,
+      PropertyChangedObserver* observer) OVERRIDE {}
 
-  // ShillDeviceClient override.
   virtual void GetProperties(const dbus::ObjectPath& device_path,
                              const DictionaryValueCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE,
-        base::Bind(&ShillDeviceClientStubImpl::PassStubDevicePrperties,
+        base::Bind(&ShillDeviceClientStubImpl::PassStubDeviceProperties,
                    weak_ptr_factory_.GetWeakPtr(),
                    device_path, callback));
   }
 
-  // ShillDeviceClient override.
   virtual base::DictionaryValue* CallGetPropertiesAndBlock(
       const dbus::ObjectPath& device_path) OVERRIDE {
     return new base::DictionaryValue;
   }
 
-  // ShillProfileClient override.
   virtual void ProposeScan(const dbus::ObjectPath& device_path,
                            const VoidDBusMethodCallback& callback) OVERRIDE {
     PostVoidCallback(callback, DBUS_METHOD_CALL_SUCCESS);
   }
 
-  // ShillDeviceClient override.
   virtual void SetProperty(const dbus::ObjectPath& device_path,
                            const std::string& name,
                            const base::Value& value,
-                           const VoidDBusMethodCallback& callback) OVERRIDE {
+                           const base::Closure& callback,
+                           const ErrorCallback& error_callback) OVERRIDE {
     base::DictionaryValue* device_properties = NULL;
     if (!stub_devices_.GetDictionary(device_path.value(), &device_properties)) {
-      PostVoidCallback(callback, DBUS_METHOD_CALL_FAILURE);
+      std::string error_name("org.chromium.flimflam.Error.Failure");
+      std::string error_message("Failed");
+      MessageLoop::current()->PostTask(FROM_HERE,
+                                       base::Bind(error_callback,
+                                                  error_name,
+                                                  error_message));
       return;
     }
     device_properties->Set(name, value.DeepCopy());
-    PostVoidCallback(callback, DBUS_METHOD_CALL_SUCCESS);
+    MessageLoop::current()->PostTask(FROM_HERE, callback);
   }
 
-  // ShillDeviceClient override.
   virtual void ClearProperty(const dbus::ObjectPath& device_path,
                              const std::string& name,
                              const VoidDBusMethodCallback& callback) OVERRIDE {
     base::DictionaryValue* device_properties = NULL;
     if (!stub_devices_.GetDictionary(device_path.value(), &device_properties)) {
       PostVoidCallback(callback, DBUS_METHOD_CALL_FAILURE);
       return;
     }
     device_properties->Remove(name, NULL);
     PostVoidCallback(callback, DBUS_METHOD_CALL_SUCCESS);
   }
 
-  // ShillDeviceClient override.
   virtual void AddIPConfig(
       const dbus::ObjectPath& device_path,
       const std::string& method,
       const ObjectPathDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS,
                                                 dbus::ObjectPath()));
   }
 
-  // ShillDeviceClient override.
   virtual dbus::ObjectPath CallAddIPConfigAndBlock(
       const dbus::ObjectPath& device_path,
       const std::string& method) OVERRIDE {
     return dbus::ObjectPath();
   }
 
-  // ShillDeviceClient override.
   virtual void RequirePin(const dbus::ObjectPath& device_path,
                           const std::string& pin,
                           bool require,
                           const base::Closure& callback,
                           const ErrorCallback& error_callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE, callback);
   }
 
-  // ShillDeviceClient override.
   virtual void EnterPin(const dbus::ObjectPath& device_path,
                         const std::string& pin,
                         const base::Closure& callback,
                         const ErrorCallback& error_callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE, callback);
   }
 
-  // ShillDeviceClient override.
   virtual void UnblockPin(const dbus::ObjectPath& device_path,
                           const std::string& puk,
                           const std::string& pin,
                           const base::Closure& callback,
                           const ErrorCallback& error_callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE, callback);
   }
 
-  // ShillDeviceClient override.
   virtual void ChangePin(const dbus::ObjectPath& device_path,
                          const std::string& old_pin,
                          const std::string& new_pin,
                          const base::Closure& callback,
                          const ErrorCallback& error_callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE, callback);
   }
 
-  // ShillDeviceClient override.
   virtual void Register(const dbus::ObjectPath& device_path,
                         const std::string& network_id,
                         const base::Closure& callback,
                         const ErrorCallback& error_callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE, callback);
   }
 
  private:
-  void PassStubDevicePrperties(const dbus::ObjectPath& device_path,
+  void PassStubDeviceProperties(const dbus::ObjectPath& device_path,
                                const DictionaryValueCallback& callback) const {
     const base::DictionaryValue* device_properties = NULL;
     if (!stub_devices_.GetDictionary(device_path.value(), &device_properties)) {
       base::DictionaryValue empty_dictionary;
       callback.Run(DBUS_METHOD_CALL_FAILURE, empty_dictionary);
       return;
     }
     callback.Run(DBUS_METHOD_CALL_SUCCESS, *device_properties);
   }
 
@@ skipping 24 matching lines @@
 ShillDeviceClient* ShillDeviceClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new ShillDeviceClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new ShillDeviceClientStubImpl();
 }
 
 }  // namespace chromeos