summaryrefslogtreecommitdiffstats
path: root/chromeos/dbus/fake_shill_service_client.cc
diff options
context:
space:
mode:
authorquiche <quiche@chromium.org>2015-01-09 12:13:16 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-09 20:14:50 +0000
commit9bb8d4e41faf758814fbb1fa89771d6f09a045e9 (patch)
tree607f23027d7fcc77b35c64b0a227353f5d0694f6 /chromeos/dbus/fake_shill_service_client.cc
parent51e49b0faba37e3dc20809f10c49fd922c39d581 (diff)
downloadchromium_src-9bb8d4e41faf758814fbb1fa89771d6f09a045e9.zip
chromium_src-9bb8d4e41faf758814fbb1fa89771d6f09a045e9.tar.gz
chromium_src-9bb8d4e41faf758814fbb1fa89771d6f09a045e9.tar.bz2
chromeos networking: move from security to securityclass property
Adopt shill's kSecurityClassProperty, in place of shill's kSecurityProperty. This eliminates the need for Chrome to understand the equivalence of WPA and RSN networks. This CL introduces only one functional change. Namely, NetworkState::GetSpecifier will now collapse WPA and RSN networks into one class (by virtue of using kSecurityClassProperty). The previous behavior is considered a bug. After this CL, only WifiAccessPointInfoProviderChromeOs still uses kSecurityProperty. In that one case, we want to break out WPA and RSN networks, to understand what fraction of systems are connecting through older APs. While there: remove a couple of unused files in chromeos/test/data/network/policy/. BUG=chromium:440032 TEST=ManagedNetworkConfigurationHandlerTest.* TEST=ONC* Review URL: https://codereview.chromium.org/788633003 Cr-Commit-Position: refs/heads/master@{#310840}
Diffstat (limited to 'chromeos/dbus/fake_shill_service_client.cc')
-rw-r--r--chromeos/dbus/fake_shill_service_client.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeos/dbus/fake_shill_service_client.cc b/chromeos/dbus/fake_shill_service_client.cc
index 9751972..8bb234b 100644
--- a/chromeos/dbus/fake_shill_service_client.cc
+++ b/chromeos/dbus/fake_shill_service_client.cc
@@ -390,7 +390,7 @@ base::DictionaryValue* FakeShillServiceClient::SetServiceProperties(
properties->SetStringWithoutPathExpansion(shill::kStateProperty, state);
properties->SetBooleanWithoutPathExpansion(shill::kVisibleProperty, visible);
if (type == shill::kTypeWifi) {
- properties->SetStringWithoutPathExpansion(shill::kSecurityProperty,
+ properties->SetStringWithoutPathExpansion(shill::kSecurityClassProperty,
shill::kSecurityNone);
properties->SetStringWithoutPathExpansion(shill::kModeProperty,
shill::kModeManaged);