Revert of [CrOS Tether] Add the notion of a tether DeviceState.

chromeos/network/network_state_handler_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 "chromeos/network/network_state_handler.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
@@ skipping 10 matching lines @@
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_device_client.h"
 #include "chromeos/dbus/shill_ipconfig_client.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/network/device_state.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_state_handler_observer.h"
-#include "chromeos/network/tether_constants.h"
 #include "dbus/object_path.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace {
 
 void ErrorCallbackFunction(const std::string& error_name,
                            const std::string& error_message) {
   LOG(ERROR) << "Shill Error: " << error_name << " : " << error_message;
 }
@@ skipping 25 matching lines @@
 using chromeos::NetworkStateHandler;
 
 class TestObserver : public chromeos::NetworkStateHandlerObserver {
  public:
   explicit TestObserver(NetworkStateHandler* handler)
       : handler_(handler),
         device_list_changed_count_(0),
         device_count_(0),
         network_list_changed_count_(0),
         network_count_(0),
-        default_network_change_count_(0),
-        scan_completed_count_(0) {}
+        default_network_change_count_(0) {
+  }
 
   ~TestObserver() override {}
 
   void DeviceListChanged() override {
     NetworkStateHandler::DeviceStateList devices;
     handler_->GetDeviceList(&devices);
     device_count_ = devices.size();
     ++device_list_changed_count_;
   }
 
@@ skipping 30 matching lines @@
   void NetworkPropertiesUpdated(const NetworkState* network) override {
     DCHECK(network);
     property_updates_[network->path()]++;
   }
 
   void DevicePropertiesUpdated(const DeviceState* device) override {
     DCHECK(device);
     device_property_updates_[device->path()]++;
   }
 
-  void ScanCompleted(const DeviceState* device) override {
-    DCHECK(device);
-    scan_completed_count_++;
-  }
-
   size_t device_list_changed_count() { return device_list_changed_count_; }
   size_t device_count() { return device_count_; }
   size_t network_list_changed_count() { return network_list_changed_count_; }
   size_t network_count() { return network_count_; }
   size_t default_network_change_count() {
     return default_network_change_count_;
   }
-  size_t scan_completed_count() { return scan_completed_count_; }
   void reset_change_counts() {
     DVLOG(1) << "=== RESET CHANGE COUNTS ===";
     default_network_change_count_ = 0;
     device_list_changed_count_ = 0;
     network_list_changed_count_ = 0;
-    scan_completed_count_ = 0;
     connection_state_changes_.clear();
   }
   void reset_updates() {
     property_updates_.clear();
     device_property_updates_.clear();
   }
   std::string default_network() { return default_network_; }
   std::string default_network_connection_state() {
     return default_network_connection_state_;
   }
@@ skipping 15 matching lines @@
     return network_connection_state_[service_path];
   }
 
  private:
   NetworkStateHandler* handler_;
   size_t device_list_changed_count_;
   size_t device_count_;
   size_t network_list_changed_count_;
   size_t network_count_;
   size_t default_network_change_count_;
-  size_t scan_completed_count_;
   std::string default_network_;
   std::string default_network_connection_state_;
   std::map<std::string, int> property_updates_;
   std::map<std::string, int> device_property_updates_;
   std::map<std::string, int> connection_state_changes_;
   std::map<std::string, std::string> network_connection_state_;
 
   DISALLOW_COPY_AND_ASSIGN(TestObserver);
 };
 
@@ skipping 138 matching lines @@
                 NetworkTypePattern::Mobile())->path());
   EXPECT_EQ(
       kShillManagerClientStubCellular,
       network_state_handler_->FirstNetworkByType(NetworkTypePattern::Cellular())
           ->path());
   EXPECT_EQ(shill::kStateOnline,
             test_observer_->default_network_connection_state());
 }
 
 TEST_F(NetworkStateHandlerTest, GetNetworkList) {
-  network_state_handler_->SetTetherTechnologyState(
-      NetworkStateHandler::TECHNOLOGY_ENABLED);
-
   // Ensure that the network list is the expected size.
   const size_t kNumShillManagerClientStubImplServices = 4;
   EXPECT_EQ(kNumShillManagerClientStubImplServices,
             test_observer_->network_count());
   // Add a non-visible network to the profile.
   const std::string profile = "/profile/profile1";
   const std::string wifi_favorite_path = "/service/wifi_faviorite";
   service_test_->AddService(wifi_favorite_path,
                             "wifi_faviorite_guid",
                             "wifi_faviorite",
@@ skipping 65 matching lines @@
   // Get configured (profile) networks.
   network_state_handler_->GetNetworkListByType(NetworkTypePattern::Default(),
                                                true /* configured_only */,
                                                false /* visible_only */,
                                                0 /* no limit */,
                                                &networks);
   EXPECT_EQ(kNumTetherNetworks + 1u, networks.size());
 }
 
 TEST_F(NetworkStateHandlerTest, GetTetherNetworkList) {
-  network_state_handler_->SetTetherTechnologyState(
-      NetworkStateHandler::TECHNOLOGY_ENABLED);
-
   NetworkStateHandler::NetworkStateList tether_networks;
 
   GetTetherNetworkList(0 /* no limit */, &tether_networks);
   EXPECT_EQ(0u, tether_networks.size());
 
   network_state_handler_->AddTetherNetworkState(
       kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
       kTetherSignalStrength1);
 
   GetTetherNetworkList(0 /* no limit */, &tether_networks);
@@ skipping 133 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(
       NetworkStateHandler::TECHNOLOGY_UNAVAILABLE,
       network_state_handler_->GetTechnologyState(NetworkTypePattern::Wimax()));
 }
 
 TEST_F(NetworkStateHandlerTest, TetherTechnologyState) {
   EXPECT_EQ(
       NetworkStateHandler::TECHNOLOGY_UNAVAILABLE,
       network_state_handler_->GetTechnologyState(NetworkTypePattern::Tether()));
-  EXPECT_FALSE(network_state_handler_->GetDeviceState(kTetherDevicePath));
-  EXPECT_FALSE(network_state_handler_->GetDeviceStateByType(
-      NetworkTypePattern::Tether()));
 
-  // Test SetTetherTechnologyState():
-  network_state_handler_->SetTetherTechnologyState(
-      NetworkStateHandler::TECHNOLOGY_AVAILABLE);
-  EXPECT_EQ(1u, test_observer_->device_list_changed_count());
-  EXPECT_EQ(
-      NetworkStateHandler::TECHNOLOGY_AVAILABLE,
-      network_state_handler_->GetTechnologyState(NetworkTypePattern::Tether()));
-  const DeviceState* tether_device_state =
-      network_state_handler_->GetDeviceState(kTetherDevicePath);
-  EXPECT_TRUE(tether_device_state);
-  EXPECT_EQ(tether_device_state, network_state_handler_->GetDeviceStateByType(
-                                     NetworkTypePattern::Tether()));
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+      chromeos::switches::kEnableTether);
 
-  // Test SetTechnologyEnabled() with a tether network:
-  network_state_handler_->SetTechnologyEnabled(
-      NetworkTypePattern::Tether(), true, network_handler::ErrorCallback());
-  EXPECT_EQ(2u, test_observer_->device_list_changed_count());
   EXPECT_EQ(
       NetworkStateHandler::TECHNOLOGY_ENABLED,
       network_state_handler_->GetTechnologyState(NetworkTypePattern::Tether()));
-  EXPECT_EQ(tether_device_state,
-            network_state_handler_->GetDeviceState(kTetherDevicePath));
-  EXPECT_EQ(tether_device_state, network_state_handler_->GetDeviceStateByType(
-                                     NetworkTypePattern::Tether()));
-
-  // Test SetProhibitedTechnologies() with a tether network:
-  network_state_handler_->SetProhibitedTechnologies(
-      std::vector<std::string>{kTypeTether}, network_handler::ErrorCallback());
-  EXPECT_EQ(3u, test_observer_->device_list_changed_count());
-  EXPECT_EQ(
-      NetworkStateHandler::TECHNOLOGY_PROHIBITED,
-      network_state_handler_->GetTechnologyState(NetworkTypePattern::Tether()));
-  EXPECT_EQ(tether_device_state,
-            network_state_handler_->GetDeviceState(kTetherDevicePath));
-  EXPECT_EQ(tether_device_state, network_state_handler_->GetDeviceStateByType(
-                                     NetworkTypePattern::Tether()));
-
-  // Set back to TECHNOLOGY_UNAVAILABLE; this should result in nullptr being
-  // returned by getters.
-  network_state_handler_->SetTetherTechnologyState(
-      NetworkStateHandler::TECHNOLOGY_UNAVAILABLE);
-  EXPECT_FALSE(network_state_handler_->GetDeviceState(kTetherDevicePath));
-  EXPECT_FALSE(network_state_handler_->GetDeviceStateByType(
-      NetworkTypePattern::Tether()));
-}
-
-TEST_F(NetworkStateHandlerTest, TetherScanningState) {
-  network_state_handler_->SetTetherTechnologyState(
-      NetworkStateHandler::TECHNOLOGY_ENABLED);
-
-  const DeviceState* tether_device_state =
-      network_state_handler_->GetDeviceStateByType(
-          NetworkTypePattern::Tether());
-  EXPECT_TRUE(tether_device_state);
-  EXPECT_FALSE(tether_device_state->scanning());
-  EXPECT_EQ(0u, test_observer_->scan_completed_count());
-
-  network_state_handler_->SetTetherScanState(true /* is_scanning */);
-  tether_device_state = network_state_handler_->GetDeviceStateByType(
-      NetworkTypePattern::Tether());
-  EXPECT_TRUE(tether_device_state);
-  EXPECT_TRUE(tether_device_state->scanning());
-  EXPECT_EQ(0u, test_observer_->scan_completed_count());
-
-  network_state_handler_->SetTetherScanState(false /* is_scanning */);
-  tether_device_state = network_state_handler_->GetDeviceStateByType(
-      NetworkTypePattern::Tether());
-  EXPECT_TRUE(tether_device_state);
-  EXPECT_FALSE(tether_device_state->scanning());
-  EXPECT_EQ(1u, test_observer_->scan_completed_count());
 }
 
 TEST_F(NetworkStateHandlerTest, ServicePropertyChanged) {
   // Set a service property.
   const std::string eth1 = kShillManagerClientStubDefaultService;
   const NetworkState* ethernet = network_state_handler_->GetNetworkState(eth1);
   ASSERT_TRUE(ethernet);
   EXPECT_EQ("", ethernet->security_class());
   EXPECT_EQ(1, test_observer_->PropertyUpdatesForService(eth1));
   base::Value security_class_value("TestSecurityClass");
@@ skipping 30 matching lines @@
       network_state_handler_->GetNetworkStateFromGuid(wifi_network->guid());
   EXPECT_EQ(wifi_network, wifi_network_guid);
 
   // Remove the service, verify that there is no longer a NetworkState for it.
   service_test_->RemoveService(wifi_path);
   UpdateManagerProperties();
   EXPECT_FALSE(network_state_handler_->GetNetworkState(wifi_path));
 }
 
 TEST_F(NetworkStateHandlerTest, TetherNetworkState) {
-  network_state_handler_->SetTetherTechnologyState(
-      NetworkStateHandler::TECHNOLOGY_ENABLED);
-
   EXPECT_EQ(0u, test_observer_->network_list_changed_count());
 
   network_state_handler_->AddTetherNetworkState(
       kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
       kTetherSignalStrength1);
 
   EXPECT_EQ(1u, test_observer_->network_list_changed_count());
 
   const NetworkState* tether_network =
       network_state_handler_->GetNetworkStateFromGuid(kTetherGuid1);
@@ skipping 26 matching lines @@
 
   ASSERT_FALSE(network_state_handler_->GetNetworkStateFromGuid(kTetherGuid1));
 
   // Updating tether properties should fail since the network was removed.
   EXPECT_FALSE(network_state_handler_->UpdateTetherNetworkProperties(
       kTetherGuid1, "NewNewCarrier", 15 /* battery_percentage */,
       20 /* signal_strength */));
 }
 
 TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociation) {
-  network_state_handler_->SetTetherTechnologyState(
-      NetworkStateHandler::TECHNOLOGY_ENABLED);
-
   EXPECT_EQ(0u, test_observer_->network_list_changed_count());
 
   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();
 
@@ skipping 21 matching lines @@
 
   network_state_handler_->RemoveTetherNetworkState(kTetherGuid1);
 
   EXPECT_EQ(4u, test_observer_->network_list_changed_count());
 
   wifi_network = network_state_handler_->GetNetworkStateFromGuid(kWifiGuid1);
   ASSERT_TRUE(wifi_network->tether_guid().empty());
 }
 
 TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociationWifiRemoved) {
-  network_state_handler_->SetTetherTechnologyState(
-      NetworkStateHandler::TECHNOLOGY_ENABLED);
-
   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();
 
   network_state_handler_->AddTetherNetworkState(
       kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
@@ skipping 12 matching lines @@
 
   service_test_->RemoveService(wifi_path);
   UpdateManagerProperties();
 
   tether_network =
       network_state_handler_->GetNetworkStateFromGuid(kTetherGuid1);
   ASSERT_TRUE(tether_network->tether_guid().empty());
 }
 
 TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociation_NoWifiNetwork) {
-  network_state_handler_->SetTetherTechnologyState(
-      NetworkStateHandler::TECHNOLOGY_ENABLED);
-
   network_state_handler_->AddTetherNetworkState(
       kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
       kTetherSignalStrength1);
 
   EXPECT_FALSE(
       network_state_handler_->AssociateTetherNetworkStateWithWifiNetwork(
           kTetherGuid1, kWifiGuid1));
 }
 
 TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociation_NoTetherNetwork) {
-  network_state_handler_->SetTetherTechnologyState(
-      NetworkStateHandler::TECHNOLOGY_ENABLED);
-
   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();
 
   ASSERT_FALSE(
       network_state_handler_->AssociateTetherNetworkStateWithWifiNetwork(
           kTetherGuid1, kWifiGuid1));
 }
 
 TEST_F(NetworkStateHandlerTest, SetTetherNetworkStateConnectionState) {
-  network_state_handler_->SetTetherTechnologyState(
-      NetworkStateHandler::TECHNOLOGY_ENABLED);
-
   network_state_handler_->AddTetherNetworkState(
       kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
       kTetherSignalStrength1);
 
   // Add corresponding Wi-Fi network.
   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 */);
@@ skipping 274 matching lines @@
                                     shill::kIPConfigProperty,
                                     base::Value(kIPConfigPath));
   UpdateManagerProperties();
   EXPECT_EQ(1, test_observer_->PropertyUpdatesForDevice(
       kShillManagerClientStubWifiDevice));
   EXPECT_EQ(1, test_observer_->PropertyUpdatesForService(
       kShillManagerClientStubDefaultWifi));
 }
 
 }  // namespace chromeos