Merge 150607 - Fix logic for VPN badges and network menu order

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 55 matching lines @@
   device_map_["cellular_gsm"] = cellular_gsm;
 
   // Profiles
   AddProfile("default", PROFILE_SHARED);
   AddProfile("user", PROFILE_USER);
 
   // 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();
   AddStubNetwork(ethernet, PROFILE_SHARED);
+  ethernet->set_is_active(ethernet->connected());
 
   WifiNetwork* wifi1 = new WifiNetwork("wifi1");
   wifi1->set_name("Fake WiFi1");
   wifi1->set_strength(100);
   wifi1->set_connected();
   wifi1->set_encryption(SECURITY_NONE);
   AddStubNetwork(wifi1, PROFILE_SHARED);
 
   WifiNetwork* wifi2 = new WifiNetwork("wifi2");
   wifi2->set_name("Fake WiFi2");
@@ skipping 186 matching lines @@
   NetworkUIData vpn4_ui_data;
   vpn4_ui_data.set_onc_source(NetworkUIData::ONC_SOURCE_DEVICE_POLICY);
   vpn4->set_ui_data(vpn4_ui_data);
   AddStubNetwork(vpn4, PROFILE_USER);
 
   wifi_scanning_ = false;
   offline_mode_ = false;
 
   // Ensure our active network is connected and vice versa, otherwise our
   // autotest browser_tests sometimes conclude the device is offline.
-  CHECK(active_network()->connected());
+  CHECK(active_network()->connected())
+      << "Active: " << active_network()->name();
   CHECK(connected_network()->is_active());
 
   std::string test_blob(
         "{"
         "  \"NetworkConfigurations\": ["
         "    {"
         "      \"GUID\": \"guid\","
         "      \"Type\": \"VPN\","
         "      \"Name\": \"VPNtest\","
         "      \"VPN\": {"
@@ skipping 17 matching lines @@
 
 bool NetworkLibraryImplStub::IsCros() const {
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////
 // NetworkLibraryImplStub private methods.
 
 void NetworkLibraryImplStub::AddStubNetwork(
     Network* network, NetworkProfileType profile_type) {
-  network->priority_order_ = network_priority_order_++;
+  // Currently we don't prioritize networks in Shill so don't do so in the stub.
+  // network->priority_order_ = network_priority_order_++;
   network->CalculateUniqueId();
   if (!network->unique_id().empty())
     network_unique_id_map_[network->unique_id()] = network;
   AddNetwork(network);
   UpdateActiveNetwork(network);
   SetProfileType(network, profile_type);
   AddStubRememberedNetwork(network);
 }
 
 // Add a remembered network to the appropriate profile if specified.
@@ skipping 61 matching lines @@
   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;
     }
   }
 
+  // Disconnect ethernet when connecting to a new network (for UI testing).
+  if (network->type() != TYPE_VPN) {
+    ethernet_->set_is_active(false);
+    ethernet_->set_disconnected();
+  }
+
   // Set connected state.
   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) {
@@ skipping 245 matching lines @@
     HardwareAddressFormat format) {
   *hardware_address = hardware_address_;
   return ip_configs_;
 }
 
 void NetworkLibraryImplStub::SetIPConfig(const NetworkIPConfig& ipconfig) {
     ip_configs_.push_back(ipconfig);
 }
 
 }  // namespace chromeos