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

6 files changed, 21 insertions, 29 deletions

diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index 5a32d41..b983daa1 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -1371,16 +1371,16 @@ class NetworkLibraryImpl : public NetworkLibrary  {
     DVLOG(1) << "Remembered networks:";
     for (int i = 0; i < system->remembered_service_size; i++) {
       const ServiceInfo* service = system->GetRememberedServiceInfo(i);
-      // Only services marked as favorite are considered remembered networks.
+      // Only services marked as auto_connect are considered remembered
+      // networks.
       // TODO(chocobo): Don't add to remembered service if currently available.
-      if (service->favorite) {
+      if (service->auto_connect) {
         DVLOG(1) << "  (" << service->type << ") " << service->name
                  << " mode=" << service->mode
                  << " sec=" << service->security
                  << " pass=" << service->passphrase
                  << " id=" << service->identity
                  << " certpath=" << service->cert_path
-                 << " fav=" << service->favorite
                  << " auto=" << service->auto_connect;
         if (service->type == TYPE_WIFI) {
           remembered_wifi_networks->push_back(new WifiNetwork(service));
diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h
index 701335f..714bc80 100644
--- a/chrome/browser/chromeos/cros/network_library.h
+++ b/chrome/browser/chromeos/cros/network_library.h
@@ -132,9 +132,7 @@ class WirelessNetwork : public Network {
   bool favorite() const { return favorite_; }
 
   void set_auto_connect(bool auto_connect) { auto_connect_ = auto_connect; }
-  // We don't have a setter for |favorite_| because to unfavorite a network is
-  // equivalent to forget a network, so we call forget network on cros for
-  // that.  See ForgetWifiNetwork().
+  void set_favorite(bool favorite) { favorite_ = favorite; }
 
   // Network overrides.
   virtual void Clear();
diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
index f4743f2..b0eb4d3 100644
--- a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
@@ -158,7 +158,7 @@ void InternetOptionsHandler::GetLocalizedValues(
   localized_strings->SetString("inetPassProtected",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NET_PROTECTED));
-  localized_strings->SetString("inetAutoConnectNetwork",
+  localized_strings->SetString("inetRememberNetwork",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT));
   localized_strings->SetString("inetCertPkcs",
@@ -459,11 +459,11 @@ DictionaryValue* InternetOptionsHandler::CellularDataPlanToDictionary(
 
 void InternetOptionsHandler::SetDetailsCallback(const ListValue* args) {
   std::string service_path;
-  std::string auto_connect_str;
+  std::string remember;
 
   if (args->GetSize() < 2 ||
       !args->GetString(0, &service_path) ||
-      !args->GetString(1, &auto_connect_str)) {
+      !args->GetString(1, &remember)) {
     NOTREACHED();
     return;
   }
@@ -501,7 +501,7 @@ void InternetOptionsHandler::SetDetailsCallback(const ListValue* args) {
     }
   }
 
-  bool auto_connect = auto_connect_str == "true";
+  bool auto_connect = remember == "true";
   if (auto_connect != network->auto_connect()) {
     network->set_auto_connect(auto_connect);
     changed = true;
diff --git a/chrome/browser/chromeos/dom_ui/network_menu_ui.cc b/chrome/browser/chromeos/dom_ui/network_menu_ui.cc
index a9aa9c4..30df58f 100644
--- a/chrome/browser/chromeos/dom_ui/network_menu_ui.cc
+++ b/chrome/browser/chromeos/dom_ui/network_menu_ui.cc
@@ -30,9 +30,8 @@ class NetworkMenuSourceDelegate : public chromeos::MenuSourceDelegate {
 
     localized_strings->SetString("reconnect", l10n_util::GetStringUTF16(
         IDS_NETWORK_RECONNECT_TITLE));
-    localized_strings->SetString("auto_connect_this_network",
-        l10n_util::GetStringUTF16(
-            IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT));
+    localized_strings->SetString("remeber_this_network",
+        l10n_util::GetStringUTF16(IDS_NETWORK_REMEMBER_THIS_NETWORK_TITLE));
     localized_strings->SetString("ssid_prompt",
         l10n_util::GetStringUTF16(IDS_NETWORK_SSID_HINT));
     localized_strings->SetString("pass_prompt",
@@ -150,14 +149,14 @@ bool NetworkMenuUI::ModelAction(const menus::MenuModel* model,
   values->GetString(2, &passphrase);  // Optional
   std::string ssid;
   values->GetString(3, &ssid);  // Optional
-  int auto_connect = -1;  // -1 indicates default action (auto connect)
-  std::string auto_connect_str;
-  if (values->GetString(4, &auto_connect_str))  // Optional
-    base::StringToInt(auto_connect_str, &auto_connect);
+  int remember = -1;  // -1 indicates not set
+  std::string remember_str;
+  if (values->GetString(4, &remember_str))  // Optional
+    base::StringToInt(remember_str, &remember);
 
   if (action == "connect" || action == "reconnect") {
     close_menu = network_menu->ConnectToNetworkAt(index, passphrase, ssid,
-                                                  auto_connect);
+                                                  remember);
   } else {
     LOG(WARNING) << "Unrecognized action: " << action
                  << " from: " << chrome::kChromeUINetworkMenu;
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();