Fix favorite and auto_connect property usage (again)

chrome/browser/chromeos/status/network_menu.cc

 // Copyright (c) 2010 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/status/network_menu.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 127 matching lines @@
         }
         if (wifi->favorite()) {
           info->passphrase = wifi->passphrase();
           info->need_passphrase = false;
         }
       } else {
         info->need_passphrase = false;
       }
       info->ip_address = wifi->ip_address();
       info->remembered = wifi->favorite();
+      info->auto_connect = info->remembered ? wifi->auto_connect() : true;
     } else {
       res = false;  // Network not found, hide entry.
     }
   } else if (flags & FLAG_CELLULAR) {
     CellularNetwork* cellular = cros->FindCellularNetworkByPath(
         menu_items_[index].wireless_path);
     if (cellular) {
       info->network_type = kNetworkTypeCellular;
       if (cros->cellular_network() && cellular->service_path() ==
           cros->cellular_network()->service_path()) {
@@ skipping 35 matching lines @@
     info->remembered = true;
   } else {
     // Not a network, e.g options, separator.
   }
   return res;
 }
 
 bool NetworkMenu::ConnectToNetworkAt(int index,
                                      const std::string& passphrase,
                                      const std::string& ssid,
-                                     int remember) const {
+                                     int auto_connect) const {
   int flags = menu_items_[index].flags;
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   if (flags & FLAG_WIFI) {
     WifiNetwork* wifi = cros->FindWifiNetworkByPath(
         menu_items_[index].wireless_path);
     if (wifi) {
       // Connect or reconnect.
-      if (remember >= 0)
-        wifi->set_favorite(remember ? true : false);
+      if (auto_connect >= 0)
+        wifi->set_auto_connect(auto_connect ? true : false);
       if (cros->wifi_network() &&
           wifi->service_path() == cros->wifi_network()->service_path()) {
         // Show the config settings for the active network.
         ShowWifi(wifi, false);
         return true;
       }
       bool connected = false;
       if (wifi->encrypted()) {
         if (wifi->IsCertificateLoaded()) {
           connected = cros->ConnectToWifiNetwork(
@@ skipping 49 matching lines @@
         }
       }
     } else {
       // If we are attempting to connect to a network that no longer exists,
       // display a notification.
       // TODO(stevenjb): Show notification.
     }
   } else if (flags & FLAG_OTHER_NETWORK) {
     bool connected = false;
     if (MenuUI::IsEnabled()) {
-      bool favorite = remember == 0 ? false : true;  // default is true
+      // default is true
+      bool auto_connect_bool = auto_connect == 0 ? false : true;
       connected = cros->ConnectToWifiNetwork(
           passphrase.empty() ? SECURITY_NONE : SECURITY_UNKNOWN,
-          ssid, passphrase, std::string(), std::string(), favorite);
+          ssid, passphrase, std::string(), std::string(), auto_connect_bool);
     }
     if (!connected) {
       ShowOther();
     }
   }
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenu, menus::MenuModel implementation:
@@ skipping 511 matching lines @@
                                       chromeos::TYPE_WIFI);
       browser->ShowOptionsTab(page);
     }
   } else {
     const bool kFocusLogin = true;
     ShowNetworkConfigView(new NetworkConfigView(), kFocusLogin);
   }
 }
 
 }  // namespace chromeos