chromeos networking: move from security to securityclass property

chrome/browser/chromeos/options/wifi_config_view.cc

Index: chrome/browser/chromeos/options/wifi_config_view.cc
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 76be879a4ad92a76b880089f04adb5e3a46c13a3..7cd0ea6656d76519ddd43c8f88a5e18bde883e9b 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -679,17 +679,17 @@ bool WifiConfigView::Login() {
         shill::kModeProperty, shill::kModeManaged);
     properties.SetBooleanWithoutPathExpansion(
         shill::kSaveCredentialsProperty, GetSaveCredentials());
-    std::string security = shill::kSecurityNone;
+    std::string security_class = shill::kSecurityNone;
     if (!eap_method_combobox_) {
       switch (security_combobox_->selected_index()) {
         case SECURITY_INDEX_NONE:
-          security = shill::kSecurityNone;
+          security_class = shill::kSecurityNone;
           break;
         case SECURITY_INDEX_WEP:
-          security = shill::kSecurityWep;
+          security_class = shill::kSecurityWep;
           break;
         case SECURITY_INDEX_PSK:
-          security = shill::kSecurityPsk;
+          security_class = shill::kSecurityPsk;
           break;
       }
       std::string passphrase = GetPassphrase();
@@ -698,11 +698,11 @@ bool WifiConfigView::Login() {
             shill::kPassphraseProperty, GetPassphrase());
       }
     } else {
-      security = shill::kSecurity8021x;
+      security_class = shill::kSecurity8021x;
       SetEapProperties(&properties, false /* not configured */);
     }
     properties.SetStringWithoutPathExpansion(
-        shill::kSecurityProperty, security);
+        shill::kSecurityClassProperty, security_class);

[stevenjb, 2014/12/08 22:27:21]

Have you verified that we can use SecurityClass to configure a new network in
Shill?

[mukesh agrawal, 2014/12/16 22:07:00]

I've updated shill and the wifi autotests. I tested manually as follows:

  for each of {open, wep, psk}:
    1. configure a hidden network using chrome://settings -> Add connection
    2. verify that shill attempts to locate the network
    3. check that the shill profile is updated correctly

Note that step 2 required a fix for crbug.com/397763. But that's unrelated to
the kSecurityProperty -> kSecurityClassProperty transition.

 
     // Configure and connect to network.
     ui::NetworkConnect::Get()->CreateConfigurationAndConnect(&properties,
@@ -899,7 +899,7 @@ void WifiConfigView::Init(bool show_8021x) {
   const NetworkState* network = GetNetworkState();
   if (network) {
     if (network->type() == shill::kTypeWifi) {
-      if (network->security() == shill::kSecurity8021x)
+      if (network->security_class() == shill::kSecurity8021x)
         show_8021x = true;
     } else if (network->type() == shill::kTypeEthernet) {
       show_8021x = true;