This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/mock_shill_device_client.h

Index: chromeos/dbus/mock_shill_device_client.h
diff --git a/chromeos/dbus/mock_shill_device_client.h b/chromeos/dbus/mock_shill_device_client.h
index 81c7d30f0ad42f404ba21f862d018f64a2dea86e..bce95649b3cec8fc2db6e8affa13a759102a7afc 100644
--- a/chromeos/dbus/mock_shill_device_client.h
+++ b/chromeos/dbus/mock_shill_device_client.h
@@ -28,16 +28,17 @@ class MockShillDeviceClient : public ShillDeviceClient {
                base::DictionaryValue*(const dbus::ObjectPath& device_path));
   MOCK_METHOD2(ProposeScan, void(const dbus::ObjectPath& device_path,
                                  const VoidDBusMethodCallback& callback));
-  MOCK_METHOD4(SetProperty, void(const dbus::ObjectPath& device_path,
+  MOCK_METHOD5(SetProperty, void(const dbus::ObjectPath& device_path,
                                  const std::string& name,
                                  const base::Value& value,
-                                 const VoidDBusMethodCallback& callback));
+                                 const base::Closure& callback,
+                                 const ErrorCallback& error_callback));
   MOCK_METHOD3(ClearProperty, void(const dbus::ObjectPath& device_path,
                                    const std::string& name,
                                    const VoidDBusMethodCallback& callback));
   MOCK_METHOD3(AddIPConfig, void(const dbus::ObjectPath& device_path,
                                  const std::string& method,
-                                 const ObjectPathDBusMethodCallback& callback));
+                                 const ObjectPathCallback& callback));
   MOCK_METHOD2(CallAddIPConfigAndBlock,
                dbus::ObjectPath(const dbus::ObjectPath& device_path,
                                 const std::string& method));