chromeos networking: move from security to securityclass property

chrome/browser/chromeos/options/wifi_config_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/options/wifi_config_view.h"
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 661 matching lines @@
   if (service_path_.empty()) {
     // TODO(stevenjb): Support modifying existing EAP configurations.
     // Will probably wait to do this in WebUI instead.
     properties.SetStringWithoutPathExpansion(
         shill::kTypeProperty, shill::kTypeWifi);
     shill_property_util::SetSSID(GetSsid(), &properties);
     properties.SetStringWithoutPathExpansion(
         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();
       if (!passphrase.empty()) {
         properties.SetStringWithoutPathExpansion(
             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,
                                                              share_network);
   } else {
     if (!network) {
       // Shill no longer knows about this network (edge case).
       // TODO(stevenjb): Add notification for this.
       NET_LOG_ERROR("Network not found", service_path_);
       return true;  // Close dialog
@@ skipping 176 matching lines @@
       shill::kEapCaCertPemProperty, pem_list);
 }
 
 void WifiConfigView::Cancel() {
 }
 
 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;
     } else {
       NOTREACHED() << "Unexpected network type for WifiConfigView: "
                    << network->type() << " Path: " << service_path_;
     }
     ParseEAPUIProperty(&eap_method_ui_data_, network, ::onc::eap::kOuter);
     ParseEAPUIProperty(&phase_2_auth_ui_data_, network, ::onc::eap::kInner);
     ParseEAPUIProperty(
@@ skipping 466 matching lines @@
 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data,
                                         const NetworkState* network,
                                         const std::string& key) {
   std::string onc_tag = network->type() == shill::kTypeEthernet
                             ? ::onc::ethernet::kEAP
                             : ::onc::wifi::kEAP;
   ParseUIProperty(property_ui_data, network, onc_tag + '.' + key);
 }
 
 }  // namespace chromeos