Revert 137809 - Broke Linux ChromiumOS

chrome/browser/chromeos/cros/network_library_impl_stub.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/chromeos/cros/network_library_impl_stub.h"
 
 #include "base/bind.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
@@ skipping 367 matching lines @@
     remembered->set_name(network->name());
     remembered->set_unique_id(network->unique_id());
     // ValidateAndAddRememberedNetwork will insert the network into the matching
     // profile and set the profile type + path.
     if (!ValidateAndAddRememberedNetwork(remembered))
       NOTREACHED();
   }
 }
 
 void NetworkLibraryImplStub::ConnectToNetwork(Network* network) {
-  std::string passphrase;
   if (network->type() == TYPE_WIFI) {
     WifiNetwork* wifi = static_cast<WifiNetwork*>(network);
-    if (wifi->passphrase_required())
-      passphrase = wifi->passphrase();
-  } else if (network->type() == TYPE_WIMAX) {
-    WimaxNetwork* wimax = static_cast<WimaxNetwork*>(network);
-    if (wimax->passphrase_required())
-      passphrase = wimax->eap_passphrase();
-  }
-  if (!passphrase.empty()) {
-    if (passphrase.find("bad") == 0) {
-      NetworkConnectCompleted(network, CONNECT_BAD_PASSPHRASE);
-      return;
-    } else if (passphrase.find("error") == 0) {
-      NetworkConnectCompleted(network, CONNECT_FAILED);
-      return;
+    if (wifi->encryption() != SECURITY_NONE) {
+      if (wifi->passphrase().find("bad") == 0) {
+        NetworkConnectCompleted(network, CONNECT_BAD_PASSPHRASE);
+        return;
+      } else if (wifi->passphrase().find("error") == 0) {
+        NetworkConnectCompleted(network, CONNECT_FAILED);
+        return;
+      }
     }
   }
 
   // Set connected state.
   network->set_connected(true);
   network->set_connection_started(false);
 
   // Make the connected network the highest priority network.
   // Set all other networks of the same type to disconnected + inactive;
   int old_priority_order = network->priority_order_;
@@ skipping 248 matching lines @@
     HardwareAddressFormat format) {
   *hardware_address = hardware_address_;
   return ip_configs_;
 }
 
 void NetworkLibraryImplStub::SetIPConfig(const NetworkIPConfig& ipconfig) {
     ip_configs_.push_back(ipconfig);
 }
 
 }  // namespace chromeos