This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_profile_client.h

Index: chromeos/dbus/shill_profile_client.h
diff --git a/chromeos/dbus/shill_profile_client.h b/chromeos/dbus/shill_profile_client.h
index 47e786a76f3b6c5917f454cfc5e0313e1eaeab38..1affbe0e06fba17828521dbd98730e218754341e 100644
--- a/chromeos/dbus/shill_profile_client.h
+++ b/chromeos/dbus/shill_profile_client.h
@@ -35,7 +35,10 @@ namespace chromeos {
 class CHROMEOS_EXPORT ShillProfileClient {
  public:
   typedef ShillClientHelper::PropertyChangedHandler PropertyChangedHandler;
-  typedef ShillClientHelper::DictionaryValueCallback DictionaryValueCallback;
+  typedef ShillClientHelper::DictionaryValueCallbackWithoutStatus
+      DictionaryValueCallbackWithoutStatus;
+  typedef ShillClientHelper::ErrorCallback ErrorCallback;
+  typedef ShillClientHelper::PropertyChangedObserver PropertyChangedObserver;
 
   virtual ~ShillProfileClient();
 
@@ -44,31 +47,34 @@ class CHROMEOS_EXPORT ShillProfileClient {
   static ShillProfileClient* 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& profile_path,
-      const PropertyChangedHandler& handler) = 0;
+      PropertyChangedObserver* observer) = 0;
 
-  // Resets PropertyChanged signal handler.
-  virtual void ResetPropertyChangedHandler(
-      const dbus::ObjectPath& profile_path) = 0;
+  virtual void RemovePropertyChangedObserver(
+      const dbus::ObjectPath& profile_path,
+      PropertyChangedObserver* observer) = 0;
 
   // Calls GetProperties method.
   // |callback| is called after the method call succeeds.
-  virtual void GetProperties(const dbus::ObjectPath& profile_path,
-                             const DictionaryValueCallback& callback) = 0;
+  virtual void GetProperties(
+      const dbus::ObjectPath& profile_path,
+      const DictionaryValueCallbackWithoutStatus& callback,
+      const ErrorCallback& error_callback) = 0;
 
   // Calls GetEntry method.
   // |callback| is called after the method call succeeds.
   virtual void GetEntry(const dbus::ObjectPath& profile_path,
                         const std::string& entry_path,
-                        const DictionaryValueCallback& callback) = 0;
+                        const DictionaryValueCallbackWithoutStatus& callback,
+                        const ErrorCallback& error_callback) = 0;
 
   // Calls DeleteEntry method.
   // |callback| is called after the method call succeeds.
   virtual void DeleteEntry(const dbus::ObjectPath& profile_path,
                            const std::string& entry_path,
-                           const VoidDBusMethodCallback& callback) = 0;
+                           const base::Closure& callback,
+                           const ErrorCallback& error_callback) = 0;
 
  protected:
   // Create() should be used instead.