Changed wifi arcs to mobile bars for Tether network.

chromeos/network/network_state_handler_unittest.cc

Index: chromeos/network/network_state_handler_unittest.cc
diff --git a/chromeos/network/network_state_handler_unittest.cc b/chromeos/network/network_state_handler_unittest.cc
index 56180b775640be2f8f0de0359caf5aab53245d68..37aef748b811b30550bd01971204ca95d50e1f66 100644
--- a/chromeos/network/network_state_handler_unittest.cc
+++ b/chromeos/network/network_state_handler_unittest.cc
@@ -718,7 +718,7 @@ TEST_F(NetworkStateHandlerTest, TetherNetworkState) {
 
   network_state_handler_->AddTetherNetworkState(
       kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
-      kTetherSignalStrength1, false /* has_connected_to_network */);
+      kTetherSignalStrength1, kTetherHasConnectedToHost2);

[Kyle Horimoto, 2017/05/03 01:53:34]

Please revert this change. I purposely did not use this constant because I
wanted to make it clear which parameter was different from the other default
values.

[lesliewatkins, 2017/05/03 22:00:25]

Done.

 
   EXPECT_EQ(1u, test_observer_->network_list_changed_count());
 
@@ -818,6 +818,49 @@ TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociation) {
   ASSERT_TRUE(wifi_network->tether_guid().empty());
 }
 
+TEST_F(NetworkStateHandlerTest, TetherNetworkStateDisassociation) {
+  network_state_handler_->SetTetherTechnologyState(
+      NetworkStateHandler::TECHNOLOGY_ENABLED);
+
+  EXPECT_EQ(0u, test_observer_->network_list_changed_count());

[Kyle Horimoto, 2017/05/03 01:53:34]

nit: You don't need to verify this. It's assumed that before you do anything, it
will be 0.

[lesliewatkins, 2017/05/03 22:00:25]

Done.

+
+  const std::string profile = "/profile/profile1";
+  const std::string wifi_path = "/service/wifi_with_guid";
+  AddService(wifi_path, kWifiGuid1, kWifiName1, shill::kTypeWifi,
+             shill::kStateOnline);
+  profile_test_->AddProfile(profile, "" /* userhash */);
+  EXPECT_TRUE(profile_test_->AddService(profile, wifi_path));
+  UpdateManagerProperties();
+
+  EXPECT_EQ(1u, test_observer_->network_list_changed_count());
+
+  network_state_handler_->AddTetherNetworkState(
+      kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
+      kTetherSignalStrength1, kTetherHasConnectedToHost1);
+
+  EXPECT_EQ(2u, test_observer_->network_list_changed_count());
+
+  EXPECT_TRUE(
+      network_state_handler_->AssociateTetherNetworkStateWithWifiNetwork(
+          kTetherGuid1, kWifiGuid1));
+
+  EXPECT_EQ(3u, test_observer_->network_list_changed_count());
+
+  const NetworkState* wifi_network =
+      network_state_handler_->GetNetworkStateFromGuid(kWifiGuid1);
+  EXPECT_EQ(kTetherGuid1, wifi_network->tether_guid());
+
+  const NetworkState* tether_network =
+      network_state_handler_->GetNetworkStateFromGuid(kTetherGuid1);
+  EXPECT_EQ(kWifiGuid1, tether_network->tether_guid());
+
+  network_state_handler_->DisassociateTetherNetworkStateWithWifiNetwork(
+      kTetherGuid1, kWifiGuid1);
+

[Kyle Horimoto, 2017/05/03 01:53:34]

After you make the NotifyNetworkListChanged() change, add this:

EXPECT_EQ(4u, test_observer_->network_list_changed_count());

[lesliewatkins, 2017/05/03 22:00:25]

Done.

+  ASSERT_TRUE(wifi_network->tether_guid().empty());
+  ASSERT_TRUE(tether_network->tether_guid().empty());
+}
+
 TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociationWifiRemoved) {
   network_state_handler_->SetTetherTechnologyState(
       NetworkStateHandler::TECHNOLOGY_ENABLED);