Clean up shill fake implementations

chromeos/dbus/fake_shill_device_client.cc

Index: chromeos/dbus/fake_shill_device_client.cc
diff --git a/chromeos/dbus/fake_shill_device_client.cc b/chromeos/dbus/fake_shill_device_client.cc
index dd0322f7eb9c88123ff0c5c6a7793cd0ac9128bc..bb26d8acb9b59bd52063616b1d53f5db1bea46b4 100644
--- a/chromeos/dbus/fake_shill_device_client.cc
+++ b/chromeos/dbus/fake_shill_device_client.cc
@@ -237,18 +237,17 @@ ShillDeviceClient::TestInterface* FakeShillDeviceClient::GetTestInterface() {
 
 void FakeShillDeviceClient::AddDevice(const std::string& device_path,
                                       const std::string& type,
-                                      const std::string& object_path) {
+                                      const std::string& name) {
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
       AddDevice(device_path);
 
   base::DictionaryValue* properties = GetDeviceProperties(device_path);
   properties->SetWithoutPathExpansion(shill::kTypeProperty,
                                       base::Value::CreateStringValue(type));
+  properties->SetWithoutPathExpansion(shill::kNameProperty,
+                                      base::Value::CreateStringValue(name));
   properties->SetWithoutPathExpansion(
-      shill::kNameProperty,
-      base::Value::CreateStringValue(object_path));
-  properties->SetWithoutPathExpansion(
-      shill::kDBusObjectProperty, base::Value::CreateStringValue(object_path));
+      shill::kDBusObjectProperty, base::Value::CreateStringValue(device_path));
   properties->SetWithoutPathExpansion(
       shill::kDBusServiceProperty,
       base::Value::CreateStringValue(modemmanager::kModemManager1ServiceName));