Add a CONNECT_REQUESTED state to Network ConnectionState.

chrome/browser/chromeos/status/network_menu_icon_unittest.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/status/network_menu_icon.h"
 
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
@@ skipping 126 matching lines @@
     // 3G connecting = IDR_STATUSBAR_NETWORK_BARS1 (faded).
     cellular_connecting_image_ = NetworkMenuIcon::GenerateConnectingBitmap(
         NetworkMenuIcon::GetImage(NetworkMenuIcon::BARS, 1,
                                   NetworkMenuIcon::COLOR_DARK));
   }
 
   virtual void TearDown() OVERRIDE {
   }
 
  protected:
-  void SetConnected(Network* network, bool connected) {
+  void SetConnected(Network* network) {
     Network::TestApi test_network(network);
-    test_network.SetConnected(connected);
+    test_network.SetConnected();
   }
 
-  void SetConnecting(Network* network, bool connecting) {
+  void SetConnecting(Network* network) {
     Network::TestApi test_network(network);
-    test_network.SetConnecting(connecting);
+    test_network.SetConnecting();
+  }
+
+  void SetDisconnected(Network* network) {
+    Network::TestApi test_network(network);
+    test_network.SetDisconnected();
   }
 
   void SetActive(Network* network, bool active) {
     if (active) {
       cros_->SetActiveNetwork(network->type(), network->service_path());
     } else {
       cros_->SetActiveNetwork(network->type(), "");
     }
   }
 
@@ skipping 42 matching lines @@
   gfx::ImageSkia cellular_connected_100_image_;
   gfx::ImageSkia cellular_roaming_50_image_;
   gfx::ImageSkia cellular_disconnected_image_;
   gfx::ImageSkia cellular_connecting_image_;
 };
 
 // Compare icon cache results against expected results fron SetUp().
 TEST_F(NetworkMenuIconTest, EthernetIcon) {
   Network* network = cros_->FindNetworkByPath("eth1");
   ASSERT_NE(static_cast<const Network*>(NULL), network);
-  SetConnected(network, true);
+  SetConnected(network);
   gfx::ImageSkia icon = NetworkMenuIcon::GetImage(network,
                                                   NetworkMenuIcon::COLOR_DARK);
   EXPECT_TRUE(CompareImages(icon, ethernet_connected_image_));
 
-  SetConnected(network, false);
+  SetDisconnected(network);
   icon = NetworkMenuIcon::GetImage(network,
                                    NetworkMenuIcon::COLOR_DARK);
   EXPECT_TRUE(CompareImages(icon, ethernet_disconnected_image_));
 }
 
 TEST_F(NetworkMenuIconTest, WifiIcon) {
   WifiNetwork* network = cros_->FindWifiNetworkByPath("wifi1");
   ASSERT_NE(static_cast<const Network*>(NULL), network);
   gfx::ImageSkia icon = NetworkMenuIcon::GetImage(network,
                                                   NetworkMenuIcon::COLOR_DARK);
   EXPECT_TRUE(CompareImages(icon, wifi_connected_100_image_));
 
   SetStrength(network, 50);
   SetEncryption(network, SECURITY_RSN);
   icon = NetworkMenuIcon::GetImage(network,
                                    NetworkMenuIcon::COLOR_DARK);
   EXPECT_TRUE(CompareImages(icon, wifi_encrypted_50_image_));
 
-  SetConnected(network, false);
+  SetDisconnected(network);
   SetStrength(network, 0);
   SetEncryption(network, SECURITY_NONE);
   icon = NetworkMenuIcon::GetImage(network,
                                    NetworkMenuIcon::COLOR_DARK);
   EXPECT_TRUE(CompareImages(icon, wifi_disconnected_image_));
 }
 
 TEST_F(NetworkMenuIconTest, CellularIcon) {
   CellularNetwork* network = cros_->FindCellularNetworkByPath("cellular1");
   ASSERT_NE(static_cast<const Network*>(NULL), network);
-  SetConnected(network, true);
+  SetConnected(network);
   SetStrength(network, 100);
   SetRoamingState(network, ROAMING_STATE_HOME);
   gfx::ImageSkia icon = NetworkMenuIcon::GetImage(network,
                                                   NetworkMenuIcon::COLOR_DARK);
   EXPECT_TRUE(CompareImages(icon, cellular_connected_100_image_));
 
   SetStrength(network, 50);
   SetRoamingState(network, ROAMING_STATE_ROAMING);
   icon = NetworkMenuIcon::GetImage(network,
                                    NetworkMenuIcon::COLOR_DARK);
   EXPECT_TRUE(CompareImages(icon, cellular_roaming_50_image_));
 
-  SetConnected(network, false);
+  SetDisconnected(network);
   SetStrength(network, 0);
   SetRoamingState(network, ROAMING_STATE_HOME);
   icon = NetworkMenuIcon::GetImage(network,
                                    NetworkMenuIcon::COLOR_DARK);
   EXPECT_TRUE(CompareImages(icon, cellular_disconnected_image_));
 }
 
 namespace {
 
 class TestNetworkMenuIcon : public NetworkMenuIcon {
@@ skipping 35 matching lines @@
 // See network_library_unit_test.cc for more info.
 
 TEST_F(NetworkMenuIconTest, StatusIconMenuMode) {
   TestNetworkMenuIcon menu_icon(NetworkMenuIcon::MENU_MODE);
   gfx::ImageSkia icon;
 
   // Set cellular1 to connecting.
   CellularNetwork* cellular1 = cros_->FindCellularNetworkByPath("cellular1");
   ASSERT_NE(static_cast<const Network*>(NULL), cellular1);
   SetRoamingState(cellular1, ROAMING_STATE_HOME);  // Clear romaing state
-  SetConnecting(cellular1, true);
+  SetConnecting(cellular1);
 
   // For MENU_MODE, we always display the connecting icon (cellular1).
   icon = menu_icon.GetIconAndText(NULL);
   EXPECT_TRUE(CompareImages(icon, cellular_connecting_image_));
 
   // Set cellular1 to connected; ethernet icon should be shown.
-  SetConnected(cellular1, true);
+  SetConnected(cellular1);
   icon = menu_icon.GetIconAndText(NULL);
   EXPECT_TRUE(CompareImages(icon, ethernet_connected_image_));
 
   // Set ethernet to inactive/disconnected; wifi icon should be shown.
   Network* eth1 = cros_->FindNetworkByPath("eth1");
   ASSERT_NE(static_cast<const Network*>(NULL), eth1);
   SetActive(eth1, false);
-  SetConnected(eth1, false);
+  SetDisconnected(eth1);
   icon = menu_icon.GetIconAndText(NULL);
   EXPECT_TRUE(CompareImages(icon, wifi_connected_100_image_));
 }
 
 TEST_F(NetworkMenuIconTest, StatusIconDropdownMode) {
   TestNetworkMenuIcon menu_icon(NetworkMenuIcon::DROPDOWN_MODE);
   gfx::ImageSkia icon;
 
   // Set wifi1 to connecting.
   WifiNetwork* wifi1 = cros_->FindWifiNetworkByPath("wifi1");
   ASSERT_NE(static_cast<const Network*>(NULL), wifi1);
-  SetConnecting(wifi1, true);
+  SetConnecting(wifi1);
 
   // For DROPDOWN_MODE, we prioritize the connected network (ethernet).
   icon = menu_icon.GetIconAndText(NULL);
   EXPECT_TRUE(CompareImages(icon, ethernet_connected_image_));
 
   // Set ethernet to inactive/disconnected.
   Network* ethernet = cros_->FindNetworkByPath("eth1");
   ASSERT_NE(static_cast<const Network*>(NULL), ethernet);
   SetActive(ethernet, false);
-  SetConnected(ethernet, false);
+  SetDisconnected(ethernet);
 
   // Icon should now be cellular connected icon.
   icon = menu_icon.GetIconAndText(NULL);
   EXPECT_TRUE(CompareImages(icon, cellular_connected_100_image_));
 
   // Set cellular1 to disconnected; Icon should now be wimax icon.
   CellularNetwork* cellular1 = cros_->FindCellularNetworkByPath("cellular1");
   ASSERT_NE(static_cast<const Network*>(NULL), cellular1);
-  SetConnected(cellular1, false);
+  SetDisconnected(cellular1);
   icon = menu_icon.GetIconAndText(NULL);
   EXPECT_TRUE(CompareImages(icon, wimax_connected_50_image_));
 
   // Set wifi1 to connected. Icon should now be wifi connected icon.
-  SetConnected(wifi1, true);
+  SetConnected(wifi1);
   icon = menu_icon.GetIconAndText(NULL);
   EXPECT_TRUE(CompareImages(icon, wifi_connected_100_image_));
 }
 
 }  // namespace chromeos