diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 19:23:10 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 19:23:10 +0000 |
| commit | 228b7d93eb3804edce4ddaa44f7839b7226c8739 (patch) | |
| tree | cf136bf35bcec2cb642f9008a86d3aeaa67260e1 /chromeos/dbus/fake_shill_service_client.cc | |
| parent | 6012d6ac14a3c188f8e997c7815cdcca29f300ed (diff) | |
| download | chromium_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 'chromeos/dbus/fake_shill_service_client.cc')
| -rw-r--r-- | chromeos/dbus/fake_shill_service_client.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chromeos/dbus/fake_shill_service_client.cc b/chromeos/dbus/fake_shill_service_client.cc index 605f372..9f4bbc3 100644 --- a/chromeos/dbus/fake_shill_service_client.cc +++ b/chromeos/dbus/fake_shill_service_client.cc @@ -305,11 +305,12 @@ ShillServiceClient::TestInterface* FakeShillServiceClient::GetTestInterface() { // ShillServiceClient::TestInterface overrides. void FakeShillServiceClient::AddService(const std::string& service_path, + const std::string& guid, const std::string& name, const std::string& type, const std::string& state, bool visible) { - AddServiceWithIPConfig(service_path, "" /* guid */, name, + AddServiceWithIPConfig(service_path, guid, name, type, state, "" /* ipconfig_path */, visible); } @@ -602,6 +603,7 @@ void FakeShillServiceClient::ContinueConnect( if (ContainsKey(connect_behavior_, service_path)) { const base::Closure& custom_connect_behavior = connect_behavior_[service_path]; + VLOG(1) << "Running custom connect behavior for " << service_path; custom_connect_behavior.Run(); return; } @@ -625,6 +627,7 @@ void FakeShillServiceClient::ContinueConnect( base::StringValue(shill::kErrorBadPassphrase))); } else { // Set Online. + VLOG(1) << "Setting state to Online " << service_path; SetServiceProperty(service_path, shill::kStateProperty, base::StringValue(shill::kStateOnline)); |