Add a CONNECT_REQUESTED state to Network ConnectionState.

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 61 matching lines @@
   // Networks
   // If these change, the expectations in network_library_unittest and
   // network_menu_icon_unittest need to be changed also.
 
   // Networks are added in priority order.
   network_priority_order_ = 0;
 
   Network* ethernet = new EthernetNetwork("eth1");
   ethernet->set_name("Fake Ethernet");
   ethernet->set_is_active(true);
-  ethernet->set_connected(true);
+  ethernet->set_connected();
   AddStubNetwork(ethernet, PROFILE_SHARED);
 
   WifiNetwork* wifi1 = new WifiNetwork("wifi1");
   wifi1->set_name("Fake WiFi1");
   wifi1->set_strength(100);
-  wifi1->set_connected(true);
+  wifi1->set_connected();
   wifi1->set_encryption(SECURITY_NONE);
   AddStubNetwork(wifi1, PROFILE_SHARED);
 
   WifiNetwork* wifi2 = new WifiNetwork("wifi2");
   wifi2->set_name("Fake WiFi2");
   wifi2->set_strength(70);
   wifi2->set_encryption(SECURITY_NONE);
   AddStubNetwork(wifi2, PROFILE_SHARED);
 
   WifiNetwork* wifi3 = new WifiNetwork("wifi3");
@@ skipping 57 matching lines @@
   wifi7->SetEAPIdentity("enterprise@example.com");
   wifi7->SetEAPPassphrase("password");
   NetworkUIData wifi7_ui_data;
   wifi7_ui_data.set_onc_source(NetworkUIData::ONC_SOURCE_DEVICE_POLICY);
   wifi7->set_ui_data(wifi7_ui_data);
   AddStubNetwork(wifi7, PROFILE_USER);
 
   CellularNetwork* cellular1 = new CellularNetwork("cellular1");
   cellular1->set_name("Fake Cellular 1");
   cellular1->set_strength(100);
-  cellular1->set_connected(true);
+  cellular1->set_connected();
   cellular1->set_activation_state(ACTIVATION_STATE_ACTIVATED);
   cellular1->set_payment_url(std::string("http://www.google.com"));
   cellular1->set_usage_url(std::string("http://www.google.com"));
   cellular1->set_network_technology(NETWORK_TECHNOLOGY_EVDO);
   AddStubNetwork(cellular1, PROFILE_NONE);
 
   CellularNetwork* cellular2 = new CellularNetwork("/cellular2");
   cellular2->set_name("Fake Cellular 2");
   cellular2->set_strength(50);
   cellular2->set_activation_state(ACTIVATION_STATE_NOT_ACTIVATED);
@@ skipping 65 matching lines @@
   wimax1->set_name("Fake WiMAX Protected");
   wimax1->set_strength(75);
   wimax1->set_connectable(true);
   wimax1->set_eap_identity("WiMAX User 1");
   wimax1->set_passphrase_required(true);
   AddStubNetwork(wimax1, PROFILE_NONE);
 
   WimaxNetwork* wimax2 = new WimaxNetwork("wimax2");
   wimax2->set_name("Fake WiMAX Open");
   wimax2->set_strength(50);
-  wimax2->set_connected(true);
+  wimax2->set_connected();
   wimax2->set_passphrase_required(false);
   AddStubNetwork(wimax2, PROFILE_NONE);
 
   VirtualNetwork* vpn1 = new VirtualNetwork("vpn1");
   vpn1->set_name("Fake VPN1");
   vpn1->set_server_hostname("vpn1server.fake.com");
   vpn1->set_provider_type(PROVIDER_TYPE_L2TP_IPSEC_PSK);
   vpn1->set_username("VPN User 1");
   AddStubNetwork(vpn1, PROFILE_USER);
 
@@ skipping 138 matching lines @@
     if (passphrase.find("bad") == 0) {
       NetworkConnectCompleted(network, CONNECT_BAD_PASSPHRASE);
       return;
     } else if (passphrase.find("error") == 0) {
       NetworkConnectCompleted(network, CONNECT_FAILED);
       return;
     }
   }
 
   // Set connected state.
-  network->set_connected(true);
+  network->set_connected();
   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_;
   network->priority_order_ = 0;
   for (NetworkMap::iterator iter = network_map_.begin();
        iter != network_map_.end(); ++iter) {
     Network* other = iter->second;
     if (other == network)
       continue;
     if (other->priority_order_ < old_priority_order)
       other->priority_order_++;
     if (other->type() == network->type()) {
       other->set_is_active(false);
-      other->set_connected(false);
+      other->set_idle();
     }
   }
 
   // Cycle data left to trigger notifications.
   if (network->type() == TYPE_CELLULAR) {
     if (network->name().find("Low Data") != std::string::npos) {
       CellularNetwork* cellular = static_cast<CellularNetwork*>(network);
       // Simulate a transition to very low data.
       cellular->set_data_left(CellularNetwork::DATA_LOW);
       NotifyCellularDataPlanChanged();
@@ skipping 195 matching lines @@
 bool NetworkLibraryImplStub::GetWifiAccessPoints(
     WifiAccessPointVector* result) {
   *result = WifiAccessPointVector();
   return true;
 }
 
 void NetworkLibraryImplStub::DisconnectFromNetwork(const Network* network) {
   // Update the network state here since no network manager in stub impl.
   Network* modify_network = const_cast<Network*>(network);
   modify_network->set_is_active(false);
-  modify_network->set_connected(false);
+  modify_network->set_idle();
   if (network == active_wifi_)
     active_wifi_ = NULL;
   else if (network == active_cellular_)
     active_cellular_ = NULL;
   else if (network == active_virtual_)
     active_virtual_ = NULL;
   SignalNetworkManagerObservers();
   NotifyNetworkChanged(network);
 }
 
@@ skipping 11 matching lines @@
     HardwareAddressFormat format) {
   *hardware_address = hardware_address_;
   return ip_configs_;
 }
 
 void NetworkLibraryImplStub::SetIPConfig(const NetworkIPConfig& ipconfig) {
     ip_configs_.push_back(ipconfig);
 }
 
 }  // namespace chromeos