Merge 68180 - Remove check of service->favorite for remembered networks.

BUG=chromium-os:9930
TEST=Log in as owner and connect/disconnect to/from several networks. Confirm the correct ones show up in the remembered networks list.

Review URL: http://codereview.chromium.org/5635001

TBR=stevenjb@google.com
Review URL: http://codereview.chromium.org/6037012

git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@70100 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 14 deletions

diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index eb3b0b6..f4a9861 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -1507,20 +1507,17 @@ 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.
-      // TODO(chocobo): Don't add to remembered service if currently available.
-      if (service->favorite) {
-        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));
-        }
+      // All services in the remembered list are "favorites" even though
+      // they do not explicitly set the "favorite" property.
+      DVLOG(1) << "  (" << service->type << ") " << service->name
+               << " mode=" << service->mode
+               << " sec=" << service->security
+               << " pass=" << service->passphrase
+               << " id=" << service->identity
+               << " certpath=" << service->cert_path
+               << " auto=" << service->auto_connect;
+      if (service->type == TYPE_WIFI) {
+        remembered_wifi_networks_.push_back(new WifiNetwork(service));
       }
     }