Clean up shill fake implementations

chromeos/dbus/fake_shill_device_client.cc

 // Copyright 2013 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.
 
 #include "chromeos/dbus/fake_shill_device_client.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/values.h"
@@ skipping 219 matching lines @@
 }
 
 ShillDeviceClient::TestInterface* FakeShillDeviceClient::GetTestInterface() {
   return this;
 }
 
 // ShillDeviceClient::TestInterface overrides.
 
 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));
   if (type == shill::kTypeCellular) {
     properties->SetWithoutPathExpansion(shill::kCellularAllowRoamingProperty,
                                         new base::FundamentalValue(false));
   }
 }
 
 void FakeShillDeviceClient::RemoveDevice(const std::string& device_path) {
@@ skipping 94 matching lines @@
   std::map<dbus::ObjectPath, PropertyObserverList*>::iterator iter =
       observer_list_.find(device_path);
   if (iter != observer_list_.end())
     return *(iter->second);
   PropertyObserverList* observer_list = new PropertyObserverList();
   observer_list_[device_path] = observer_list;
   return *observer_list;
 }
 
 }  // namespace chromeos