Clean up NetworkState members

chrome/browser/ui/webui/options/chromeos/internet_options_handler.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/ui/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 1524 matching lines @@
   dictionary.SetBoolean(kTagShowProxy, !network->profile_path().empty());
 
   // Enable static ip config for ethernet. For wifi, enable if flag is set.
   bool staticIPConfig = type == flimflam::kTypeEthernet ||
       (type == flimflam::kTypeWifi &&
        CommandLine::ForCurrentProcess()->HasSwitch(
            chromeos::switches::kEnableStaticIPConfig));
   dictionary.SetBoolean(kTagShowStaticIPConfig, staticIPConfig);
 
   dictionary.SetBoolean(kTagShowPreferred, !network->profile_path().empty());
-  bool preferred = network->priority() > 0;
+  int priority = 0;
+  shill_properties.GetIntegerWithoutPathExpansion(
+      flimflam::kPriorityProperty, &priority);
+  bool preferred = priority > 0;
   SetValueDictionary(&dictionary, kTagPreferred,
                      new base::FundamentalValue(preferred),
                      property_ui_data);
 
   NetworkPropertyUIData auto_connect_ui_data(onc_source);
   std::string onc_path_to_auto_connect;
   if (type == flimflam::kTypeWifi) {
     onc_path_to_auto_connect = base::StringPrintf(
         "%s.%s",
         onc::network_config::kWiFi,
         onc::wifi::kAutoConnect);
   } else if (type == flimflam::kTypeVPN) {
     onc_path_to_auto_connect = base::StringPrintf(
         "%s.%s",
         onc::network_config::kVPN,
         onc::vpn::kAutoConnect);
   }
   if (!onc_path_to_auto_connect.empty()) {
     auto_connect_ui_data.ParseOncProperty(
         onc_source, onc, onc_path_to_auto_connect);
   }
+  bool auto_connect = false;
+  shill_properties.GetBooleanWithoutPathExpansion(
+      flimflam::kPriorityProperty, &auto_connect);

[pneubeck (no reviews), 2013/09/04 16:32:55]

priority -> AutoConnect

[stevenjb, 2013/09/04 18:47:52]

DOH. Thanks. Done.

   SetValueDictionary(&dictionary, kTagAutoConnect,
-                     new base::FundamentalValue(network->auto_connect()),
+                     new base::FundamentalValue(auto_connect),
                      auto_connect_ui_data);
 
   PopulateConnectionDetails(network, shill_properties, &dictionary);
 
   // Show details dialog
   web_ui()->CallJavascriptFunction(kShowDetailedInfoFunction, dictionary);
 }
 
 namespace {
 
@@ skipping 432 matching lines @@
       cellular && cellular->support_network_scan());
 
   dictionary->SetBoolean(kTagWimaxAvailable,
                          handler->IsTechnologyAvailable(flimflam::kTypeWimax));
   dictionary->SetBoolean(kTagWimaxEnabled,
                          handler->IsTechnologyEnabled(flimflam::kTypeWimax));
 }
 
 }  // namespace options
 }  // namespace chromeos