diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-06 23:36:19 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-06 23:36:19 +0000 |
| commit | ca7d4e275f63f448258f6cd805d076340543221c (patch) | |
| tree | 6698ecc8d0e9c151ff583d19b3827ca773267e70 /chromeos/dbus/fake_shill_device_client.cc | |
| parent | ce8a1de39eb5d1f5119466ec78279946e18e3dd1 (diff) | |
| download | chromium_src-ca7d4e275f63f448258f6cd805d076340543221c.zip chromium_src-ca7d4e275f63f448258f6cd805d076340543221c.tar.gz chromium_src-ca7d4e275f63f448258f6cd805d076340543221c.tar.bz2 | |
Clean up shill fake implementations
This is in preparation of merging NetworkState and FavoriteState,
crbug.com/375955.
The merge will involve a number of changes to ShillPropertyHandler
and in the process of making those changes some additional logging
and test cleanup was necessary that isn't directly related to the
merge itself.
BUG=none
For trivial changes to chrome/browser/ui/webui/options/
TBR=dbeam@chromium.org
Review URL: https://codereview.chromium.org/299403012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/fake_shill_device_client.cc')
| -rw-r--r-- | chromeos/dbus/fake_shill_device_client.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chromeos/dbus/fake_shill_device_client.cc b/chromeos/dbus/fake_shill_device_client.cc index dd0322f..bb26d8a 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)); |