This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_client_helper.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_CLIENT_HELPER_H_
 #define CHROMEOS_DBUS_SHILL_CLIENT_HELPER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 59 matching lines @@
   void MonitorPropertyChanged(const std::string& interface_name);
 
   // Calls a method without results.
   void CallVoidMethod(dbus::MethodCall* method_call,
                       const VoidDBusMethodCallback& callback);
 
   // Calls a method with an object path result.
   void CallObjectPathMethod(dbus::MethodCall* method_call,
                             const ObjectPathDBusMethodCallback& callback);
 
+  // Calls a method with an object path result where there is an error callback.
+  void CallObjectPathMethodWithErrorCallback(
+      dbus::MethodCall* method_call,
+      const ObjectPathCallback& callback,
+      const ErrorCallback& error_callback);
+
   // Calls a method with a dictionary value result.
   void CallDictionaryValueMethod(dbus::MethodCall* method_call,
                                  const DictionaryValueCallback& callback);
 
   // Calls a method without results with error callback.
   void CallVoidMethodWithErrorCallback(dbus::MethodCall* method_call,
                                        const base::Closure& callback,
                                        const ErrorCallback& error_callback);
 
   // Calls a method with a dictionary value result with error callback.
@@ skipping 29 matching lines @@
   void OnPropertyChanged(dbus::Signal* signal);
 
   // Handles responses for methods without results.
   void OnVoidMethod(const VoidDBusMethodCallback& callback,
                     dbus::Response* response);
 
   // Handles responses for methods with ObjectPath results.
   void OnObjectPathMethod(const ObjectPathDBusMethodCallback& callback,
                           dbus::Response* response);
 
+  // Handles responses for methods with ObjectPath results.
+  void OnObjectPathMethodWithoutStatus(
+      const ObjectPathCallback& callback,
+      const ErrorCallback& error_callback,
+      dbus::Response* response);
+
   // Handles responses for methods with DictionaryValue results.
   void OnDictionaryValueMethod(const DictionaryValueCallback& callback,
                                dbus::Response* response);
 
   // Handles responses for methods without results.
   // Used by CallVoidMethodWithErrorCallback().
   void OnVoidMethodWithErrorCallback(const base::Closure& callback,
                                      dbus::Response* response);
 
   // Handles responses for methods with DictionaryValue results.
@@ skipping 15 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<ShillClientHelper> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ShillClientHelper);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_SHILL_CLIENT_HELPER_H_