summaryrefslogtreecommitdiffstats
path: root/ash/system
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-14 19:23:10 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-14 19:23:10 +0000
commit228b7d93eb3804edce4ddaa44f7839b7226c8739 (patch)
treecf136bf35bcec2cb642f9008a86d3aeaa67260e1 /ash/system
parent6012d6ac14a3c188f8e997c7815cdcca29f300ed (diff)
downloadchromium_src-228b7d93eb3804edce4ddaa44f7839b7226c8739.zip
chromium_src-228b7d93eb3804edce4ddaa44f7839b7226c8739.tar.gz
chromium_src-228b7d93eb3804edce4ddaa44f7839b7226c8739.tar.bz2
Use GUID in captive portal API instead of service path
Also changes the fake implementations and other tests to explicitly specify guids. BUG=none For components/wifi/fake_wifi_service.cc: TBR=mef@chromium.org Review URL: https://codereview.chromium.org/377063003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
-rw-r--r--ash/system/chromeos/network/network_state_notifier_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/system/chromeos/network/network_state_notifier_unittest.cc b/ash/system/chromeos/network/network_state_notifier_unittest.cc
index 56fed05..1032bf7 100644
--- a/ash/system/chromeos/network/network_state_notifier_unittest.cc
+++ b/ash/system/chromeos/network/network_state_notifier_unittest.cc
@@ -71,8 +71,8 @@ class NetworkStateNotifierTest : public AshTestBase {
DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
service_test->ClearServices();
const bool add_to_visible = true;
- // Create wifi and cellular networks and set to online.
- service_test->AddService("wifi1", "wifi1",
+ // Create a wifi network and set to online.
+ service_test->AddService("/service/wifi1", "wifi1_guid", "wifi1",
shill::kTypeWifi, shill::kStateIdle,
add_to_visible);
service_test->SetServiceProperty("wifi1",