[CrOS Tether] Update NetworkState to include tether properties and integrate into NetworkStateHandl…

chromeos/components/tether/tether_connector_unittest.cc

 // Copyright 2017 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 "chromeos/components/tether/tether_connector.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "chromeos/components/tether/connect_tethering_operation.h"
 #include "chromeos/components/tether/device_id_tether_network_guid_map.h"
@@ skipping 18 matching lines @@
 
 namespace tether {
 
 namespace {
 
 const char kSsid[] = "ssid";
 const char kPassword[] = "password";
 
 const char kWifiNetworkGuid[] = "wifiNetworkGuid";
 
-const char kTetherNetwork1Name[] = "tetherNetwork1Name";
-const char kTetherNetwork2Name[] = "tetherNetwork2Name";
-
 std::string CreateWifiConfigurationJsonString() {
   std::stringstream ss;
   ss << "{"
      << "  \"GUID\": \"" << kWifiNetworkGuid << "\","
      << "  \"Type\": \"" << shill::kTypeWifi << "\","
      << "  \"State\": \"" << shill::kStateIdle << "\""
      << "}";
   return ss.str();
 }
 
@@ skipping 142 matching lines @@
     return device_id_tether_network_guid_map_->GetTetherNetworkGuidForDeviceId(
         device_id);
   }
 
   void SetUpTetherNetworks() {
     // Add a tether network corresponding to both of the test devices. These
     // networks are expected to be added already before TetherConnector receives
     // its ConnectToNetwork() callback.
     network_state_handler()->AddTetherNetworkState(
         GetTetherNetworkGuid(test_devices_[0].GetDeviceId()),
-        kTetherNetwork1Name);
+        "TetherNetworkName1", "TetherNetworkCarrier1",
+        85 /* battery_percentage */, 75 /* signal_strength */);
     network_state_handler()->AddTetherNetworkState(
         GetTetherNetworkGuid(test_devices_[1].GetDeviceId()),
-        kTetherNetwork2Name);
+        "TetherNetworkName2", "TetherNetworkCarrier2",
+        90 /* battery_percentage */, 50 /* signal_strength */);
   }
 
   void SuccessfullyJoinWifiNetwork() {
     ConfigureService(CreateWifiConfigurationJsonString());
     fake_wifi_hotspot_connector_->CallMostRecentCallback(kWifiNetworkGuid);
   }
 
   void VerifyTetherAndWifiNetworkAssociation(
       const std::string& tether_network_guid) {
     const NetworkState* tether_network_state =
@@ skipping 251 matching lines @@
             fake_active_host_->GetActiveHostStatus());
   EXPECT_EQ(test_devices_[1].GetDeviceId(),
             fake_active_host_->GetActiveHostDeviceId());
   EXPECT_EQ(GetTetherNetworkGuid(test_devices_[1].GetDeviceId()),
             fake_active_host_->GetTetherNetworkGuid());
   EXPECT_TRUE(fake_active_host_->GetWifiNetworkGuid().empty());
 }
 
 }  // namespace tether
 
-}  // namespace cryptauth
+}  // namespace chromeos