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

chromeos/components/tether/active_host_network_state_updater_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/active_host_network_state_updater.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "chromeos/components/tether/fake_active_host.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_test.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/shill/dbus-constants.h"
 
 namespace chromeos {
 
 namespace tether {
 
 namespace {
 
 const char kFakeDeviceId[] = "fakeDeviceId";
 const char kWifiNetworkGuid[] = "wifiNetworkGuid";
 const char kTetherNetworkGuid[] = "tetherNetworkGuid";
-const char kTetherNetworkName[] = "tetherNetworkName";
 
 std::string CreateWifiConfigurationJsonString(const std::string& guid) {
   std::stringstream ss;
   ss << "{"
      << "  \"GUID\": \"" << guid << "\","
      << "  \"Type\": \"" << shill::kTypeWifi << "\","
      << "  \"State\": \"" << shill::kStateIdle << "\""
      << "}";
   return ss.str();
 }
@@ skipping 12 matching lines @@
     SetUpWifiNetwork();
 
     fake_active_host_ = base::MakeUnique<FakeActiveHost>();
 
     updater_ = base::WrapUnique(new ActiveHostNetworkStateUpdater(
         fake_active_host_.get(), network_state_handler()));
   }
 
   void SetUpTetherNetwork() {
     // Add tether network whose status will be changed during the test.
-    network_state_handler()->AddTetherNetworkState(kTetherNetworkGuid,
-                                                   kTetherNetworkName);
+    network_state_handler()->AddTetherNetworkState(
+        kTetherNetworkGuid, "TetherNetworkName", "TetherNetworkCarrier",
+        100 /* battery_percentage */, 100 /* signal_strength */);
   }
 
   void SetUpWifiNetwork() {
     ConfigureService(CreateWifiConfigurationJsonString(kWifiNetworkGuid));
     network_state_handler()->AssociateTetherNetworkStateWithWifiNetwork(
         kTetherNetworkGuid, kWifiNetworkGuid);
   }
 
   void TearDown() override {
     ShutdownNetworkState();
@@ skipping 43 matching lines @@
                                             kWifiNetworkGuid);
   VerifyConnected();
 
   fake_active_host_->SetActiveHostDisconnected();
   VerifyDisconnected();
 }
 
 }  // namespace tether
 
 }  // namespace cryptauth