This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_service_client.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_H_
 #define CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 20 matching lines @@
 
 // ShillServiceClient is used to communicate with the Shill Service
 // service.
 // All methods should be called from the origin thread which initializes the
 // DBusThreadManager instance.
 class CHROMEOS_EXPORT ShillServiceClient {
  public:
   typedef ShillClientHelper::PropertyChangedHandler PropertyChangedHandler;
   typedef ShillClientHelper::DictionaryValueCallback DictionaryValueCallback;
   typedef ShillClientHelper::ErrorCallback ErrorCallback;
+  typedef ShillClientHelper::PropertyChangedObserver PropertyChangedObserver;
 
   virtual ~ShillServiceClient();
 
   // Factory function, creates a new instance which is owned by the caller.
   // For normal usage, access the singleton via DBusThreadManager::Get().
   static ShillServiceClient* Create(DBusClientImplementationType type,
                                        dbus::Bus* bus);
 
-  // Sets PropertyChanged signal handler.
-  virtual void SetPropertyChangedHandler(
+  virtual void AddPropertyChangedObserver(

[hashimoto, 2012/09/21 11:52:01]

Please add method comments.

[Greg Spencer (Chromium), 2012/09/21 22:03:47]

Done.

       const dbus::ObjectPath& service_path,
-      const PropertyChangedHandler& handler) = 0;
+      PropertyChangedObserver* observer) = 0;
 
-  // Resets PropertyChanged signal handler.
-  virtual void ResetPropertyChangedHandler(
-      const dbus::ObjectPath& service_path) = 0;
+  virtual void RemovePropertyChangedObserver(
+      const dbus::ObjectPath& service_path,
+      PropertyChangedObserver* observer) = 0;
 
   // Calls GetProperties method.
   // |callback| is called after the method call succeeds.
   virtual void GetProperties(const dbus::ObjectPath& service_path,
                              const DictionaryValueCallback& callback) = 0;
 
   // Calls SetProperty method.
   // |callback| is called after the method call succeeds.
   virtual void SetProperty(const dbus::ObjectPath& service_path,
                            const std::string& name,
                            const base::Value& value,
-                           const VoidDBusMethodCallback& callback) = 0;
+                           const base::Closure& callback,
+                           const ErrorCallback& error_callback) = 0;
 
   // Calls ClearProperty method.
   // |callback| is called after the method call succeeds.
   virtual void ClearProperty(const dbus::ObjectPath& service_path,
                              const std::string& name,
-                             const VoidDBusMethodCallback& callback) = 0;
+                             const base::Closure& callback,
+                             const ErrorCallback& error_callback) = 0;
 
   // Calls Connect method.
   // |callback| is called after the method call succeeds.
   virtual void Connect(const dbus::ObjectPath& service_path,
                        const base::Closure& callback,
                        const ErrorCallback& error_callback) = 0;
 
   // Calls Disconnect method.
   // |callback| is called after the method call succeeds.
   virtual void Disconnect(const dbus::ObjectPath& service_path,
-                          const VoidDBusMethodCallback& callback) = 0;
+                          const base::Closure& callback,
+                          const ErrorCallback& error_callback) = 0;
 
   // Calls Remove method.
   // |callback| is called after the method call succeeds.
   virtual void Remove(const dbus::ObjectPath& service_path,
-                      const VoidDBusMethodCallback& callback) = 0;
+                      const base::Closure& callback,
+                      const ErrorCallback& error_callback) = 0;
 
   // Calls ActivateCellularModem method.
   // |callback| is called after the method call succeeds.
   virtual void ActivateCellularModem(
       const dbus::ObjectPath& service_path,
       const std::string& carrier,
-      const VoidDBusMethodCallback& callback) = 0;
+      const base::Closure& callback,
+      const ErrorCallback& error_callback) = 0;
 
   // DEPRECATED DO NOT USE: Calls ActivateCellularModem method and blocks until
   // the method call finishes.
   //
   // TODO(hashimoto): Refactor CrosActivateCellularModem and remove this method.
   // crosbug.com/29902
   virtual bool CallActivateCellularModemAndBlock(
       const dbus::ObjectPath& service_path,
       const std::string& carrier) = 0;
 
  protected:
   // Create() should be used instead.
   ShillServiceClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShillServiceClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_H_