This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/mock_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_MOCK_SHILL_SERVICE_CLIENT_H_
 #define CHROMEOS_DBUS_MOCK_SHILL_SERVICE_CLIENT_H_
 
 #include "base/values.h"
 #include "chromeos/dbus/shill_property_changed_observer.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "dbus/object_path.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
 
 class MockShillServiceClient : public ShillServiceClient {
  public:
   MockShillServiceClient();
   virtual ~MockShillServiceClient();
 
   MOCK_METHOD2(AddPropertyChangedObserver,
                void(const dbus::ObjectPath& service_path,
                     ShillPropertyChangedObserver* observer));
   MOCK_METHOD2(RemovePropertyChangedObserver,
                void(const dbus::ObjectPath& service_path,
                     ShillPropertyChangedObserver* observer));
   MOCK_METHOD2(GetProperties, void(const dbus::ObjectPath& service_path,
                                    const DictionaryValueCallback& callback));
-  MOCK_METHOD4(SetProperty, void(const dbus::ObjectPath& service_path,
+  MOCK_METHOD5(SetProperty, void(const dbus::ObjectPath& service_path,
                                  const std::string& name,
                                  const base::Value& value,
-                                 const VoidDBusMethodCallback& callback));
-  MOCK_METHOD3(ClearProperty, void(const dbus::ObjectPath& service_path,
+                                 const base::Closure& callback,
+                                 const ErrorCallback& error_callback));
+  MOCK_METHOD4(ClearProperty, void(const dbus::ObjectPath& service_path,
                                    const std::string& name,
-                                   const VoidDBusMethodCallback& callback));
+                                   const base::Closure& callback,
+                                   const ErrorCallback& error_callback));
   MOCK_METHOD3(Connect, void(const dbus::ObjectPath& service_path,
                              const base::Closure& callback,
                              const ErrorCallback& error_callback));
-  MOCK_METHOD2(Disconnect, void(const dbus::ObjectPath& service_path,
-                                const VoidDBusMethodCallback& callback));
-  MOCK_METHOD2(Remove, void(const dbus::ObjectPath& service_path,
-                            const VoidDBusMethodCallback& callback));
-  MOCK_METHOD3(ActivateCellularModem,
+  MOCK_METHOD3(Disconnect, void(const dbus::ObjectPath& service_path,
+                                const base::Closure& callback,
+                                const ErrorCallback& error_callback));
+  MOCK_METHOD3(Remove, void(const dbus::ObjectPath& service_path,
+                            const base::Closure& callback,
+                            const ErrorCallback& error_callback));
+  MOCK_METHOD4(ActivateCellularModem,
                void(const dbus::ObjectPath& service_path,
                     const std::string& carrier,
-                    const VoidDBusMethodCallback& callback));
+                    const base::Closure& callback,
+                    const ErrorCallback& error_callback));
   MOCK_METHOD2(CallActivateCellularModemAndBlock,
                bool(const dbus::ObjectPath& service_path,
                     const std::string& carrier));
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_MOCK_SHILL_SERVICE_CLIENT_H_