From 2c65d8dd4162b585f8dd3b09dfb9ecb64925b309 Mon Sep 17 00:00:00 2001 From: "stevenjb@chromium.org" Date: Mon, 3 Mar 2014 17:26:33 +0000 Subject: Cleanup shill_stub_helper, GetSharedProfilePath -> ShillProfileClient Also replaces IsStubPortalledWifiEnabled() with more robust logic. BUG=345033 R=pneubeck@chromium.org Review URL: https://codereview.chromium.org/183033004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254492 0039d316-1c4b-4281-b951-d872f2087c98 --- chromeos/dbus/fake_shill_service_client.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'chromeos/dbus/fake_shill_service_client.cc') diff --git a/chromeos/dbus/fake_shill_service_client.cc b/chromeos/dbus/fake_shill_service_client.cc index c968d80e..8987c18 100644 --- a/chromeos/dbus/fake_shill_service_client.cc +++ b/chromeos/dbus/fake_shill_service_client.cc @@ -13,6 +13,7 @@ #include "base/values.h" #include "chromeos/chromeos_switches.h" #include "chromeos/dbus/dbus_thread_manager.h" +#include "chromeos/dbus/shill_device_client.h" #include "chromeos/dbus/shill_manager_client.h" #include "chromeos/dbus/shill_property_changed_observer.h" #include "chromeos/dbus/shill_stub_helper.h" @@ -337,6 +338,9 @@ void FakeShillServiceClient::AddServiceWithIPConfig( bool add_to_watch_list) { DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()-> AddManagerService(service_path, add_to_visible_list, add_to_watch_list); + std::string device_path = + DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface()-> + GetDevicePathForType(type); base::DictionaryValue* properties = GetModifiableServiceProperties(service_path, true); @@ -347,8 +351,7 @@ void FakeShillServiceClient::AddServiceWithIPConfig( base::Value::CreateStringValue(name)); properties->SetWithoutPathExpansion( shill::kDeviceProperty, - base::Value::CreateStringValue( - shill_stub_helper::DevicePathForType(type))); + base::Value::CreateStringValue(device_path)); properties->SetWithoutPathExpansion( shill::kTypeProperty, base::Value::CreateStringValue(type)); -- cgit v1.1