Revert "Fix favorite and auto_connect property usage."

This reverts commit 2a5da02ef3fec8da1f223dd1990fb0b56d617188 / r66253:

Fix favorite and auto_connect property usage. BUG=chromium-os:8913 TEST=manually open chrome://settings/internet and see if remembered networks are listed properly. For DOMUI network menu, pass --enable-domui-menu for chrome to enable and check. Review URL: http://codereview.chromium.org/4818002

It broke the ChromeOS and arm compiles with:

chrome/browser/chromeos/options/wifi_config_view_browsertest.cc:44: error: ‘class chromeos::WifiNetwork’ has no member named ‘set_favorite’

TBR=kochi

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66258 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 11 deletions

diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index f0eceee..7cf5532 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -145,7 +145,6 @@ bool NetworkMenu::GetNetworkAt(int index, NetworkInfo* info) const {
       }
       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.
     }
@@ -201,7 +200,7 @@ bool NetworkMenu::GetNetworkAt(int index, NetworkInfo* info) const {
 bool NetworkMenu::ConnectToNetworkAt(int index,
                                      const std::string& passphrase,
                                      const std::string& ssid,
-                                     int auto_connect) const {
+                                     int remember) const {
   int flags = menu_items_[index].flags;
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   if (flags & FLAG_WIFI) {
@@ -209,8 +208,8 @@ bool NetworkMenu::ConnectToNetworkAt(int index,
         menu_items_[index].wireless_path);
     if (wifi) {
       // Connect or reconnect.
-      if (auto_connect >= 0)
-        wifi->set_auto_connect(auto_connect ? true : false);
+      if (remember >= 0)
+        wifi->set_favorite(remember ? true : false);
       if (cros->wifi_network() &&
           wifi->service_path() == cros->wifi_network()->service_path()) {
         // Show the config settings for the active network.
@@ -280,11 +279,10 @@ bool NetworkMenu::ConnectToNetworkAt(int index,
   } else if (flags & FLAG_OTHER_NETWORK) {
     bool connected = false;
     if (MenuUI::IsEnabled()) {
-      // default is true
-      bool auto_connect_bool = auto_connect == 0 ? false : true;
+      bool favorite = remember == 0 ? false : true;  // default is true
       connected = cros->ConnectToWifiNetwork(
           passphrase.empty() ? SECURITY_NONE : SECURITY_UNKNOWN,
-          ssid, passphrase, std::string(), std::string(), auto_connect_bool);
+          ssid, passphrase, std::string(), std::string(), favorite);
     }
     if (!connected) {
       ShowOther();
diff --git a/chrome/browser/chromeos/status/network_menu.h b/chrome/browser/chromeos/status/network_menu.h
index 05b941e..bffe26f 100644
--- a/chrome/browser/chromeos/status/network_menu.h
+++ b/chrome/browser/chromeos/status/network_menu.h
@@ -52,8 +52,7 @@ class NetworkMenu : public views::ViewMenuDelegate,
                     public menus::MenuModel {
  public:
   struct NetworkInfo {
-    NetworkInfo() :
-        need_passphrase(false), remembered(true), auto_connect(true) {}
+    NetworkInfo() : need_passphrase(false), remembered(true) {}
     // "ethernet" | "wifi" | "cellular" | "other".
     std::string network_type;
     // "connected" | "connecting" | "disconnected" | "error".
@@ -68,8 +67,6 @@ class NetworkMenu : public views::ViewMenuDelegate,
     bool need_passphrase;
     // true if the network is currently remembered.
     bool remembered;
-    // true if the network is auto connect (meaningful for Wifi only).
-    bool auto_connect;
   };
 
   NetworkMenu();