Remove the configuration of Tether-associated Wi-Fi networks once connectivity is lost.

chromeos/components/tether/initializer.cc

 // Copyright 2016 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/initializer.h"
 
 #include "base/bind.h"
 #include "chromeos/components/tether/active_host.h"
 #include "chromeos/components/tether/active_host_network_state_updater.h"
 #include "chromeos/components/tether/ble_connection_manager.h"
 #include "chromeos/components/tether/device_id_tether_network_guid_map.h"
 #include "chromeos/components/tether/host_scan_device_prioritizer.h"
 #include "chromeos/components/tether/host_scan_scheduler.h"
 #include "chromeos/components/tether/host_scanner.h"
 #include "chromeos/components/tether/local_device_data_provider.h"
+#include "chromeos/components/tether/network_configuration_remover.h"
 #include "chromeos/components/tether/notification_presenter.h"
 #include "chromeos/components/tether/tether_connector.h"
 #include "chromeos/components/tether/tether_host_fetcher.h"
+#include "chromeos/components/tether/tether_network_disconnection_handler.h"
 #include "chromeos/components/tether/wifi_hotspot_connector.h"
+#include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_connect.h"
 #include "chromeos/network/network_state_handler.h"
 #include "components/cryptauth/bluetooth_throttler_impl.h"
 #include "components/cryptauth/cryptauth_service.h"
 #include "components/cryptauth/remote_beacon_seed_fetcher.h"
 #include "components/prefs/pref_service.h"
 #include "components/proximity_auth/logging/logging.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 
@@ skipping 13 matching lines @@
 // static
 Initializer* Initializer::instance_ = nullptr;
 
 // static
 void Initializer::Init(
     cryptauth::CryptAuthService* cryptauth_service,
     std::unique_ptr<NotificationPresenter> notification_presenter,
     PrefService* pref_service,
     ProfileOAuth2TokenService* token_service,
     NetworkStateHandler* network_state_handler,
+    ManagedNetworkConfigurationHandler* managed_network_configuration_handler,
     NetworkConnect* network_connect) {
   if (!device::BluetoothAdapterFactory::IsBluetoothSupported()) {
     PA_LOG(WARNING) << "Bluetooth is not supported on this device; cannot "
                     << "initialize tether feature.";
     return;
   }
 
   if (instance_) {
     PA_LOG(WARNING) << "Tether initialization was triggered when the feature "
                     << "had already been initialized; exiting initialization "
                     << "early.";
     return;
   }
 
-  instance_ = new Initializer(
-      cryptauth_service, std::move(notification_presenter), pref_service,
-      token_service, network_state_handler, network_connect);
+  instance_ =
+      new Initializer(cryptauth_service, std::move(notification_presenter),
+                      pref_service, token_service, network_state_handler,
+                      managed_network_configuration_handler, network_connect);
 }
 
 // static
 void Initializer::Shutdown() {
   if (instance_) {
     PA_LOG(INFO) << "Shutting down tether feature.";
     delete instance_;
     instance_ = nullptr;
   }
 }
 
 // static
 void Initializer::RegisterProfilePrefs(PrefRegistrySimple* registry) {
   ActiveHost::RegisterPrefs(registry);
   HostScanDevicePrioritizer::RegisterPrefs(registry);
 }
 
 Initializer::Initializer(
     cryptauth::CryptAuthService* cryptauth_service,
     std::unique_ptr<NotificationPresenter> notification_presenter,
     PrefService* pref_service,
     ProfileOAuth2TokenService* token_service,
     NetworkStateHandler* network_state_handler,
+    ManagedNetworkConfigurationHandler* managed_network_configuration_handler,
     NetworkConnect* network_connect)
     : cryptauth_service_(cryptauth_service),
       notification_presenter_(std::move(notification_presenter)),
       pref_service_(pref_service),
       token_service_(token_service),
       network_state_handler_(network_state_handler),
+      managed_network_configuration_handler_(
+          managed_network_configuration_handler),
       network_connect_(network_connect),
       weak_ptr_factory_(this) {
   if (!token_service_->RefreshTokenIsAvailable(
           cryptauth_service_->GetAccountId())) {
     PA_LOG(INFO) << "Refresh token not yet available; "
                  << "waiting for valid token to initializing tether feature.";
     token_service_->AddObserver(this);
     return;
   }
 
@@ skipping 63 matching lines @@
   active_host_network_state_updater_ =
       base::MakeUnique<ActiveHostNetworkStateUpdater>(active_host_.get(),
                                                       network_state_handler_);
   device_id_tether_network_guid_map_ =
       base::MakeUnique<DeviceIdTetherNetworkGuidMap>();
   tether_connector_ = base::MakeUnique<TetherConnector>(
       network_connect_, network_state_handler_, wifi_hotspot_connector_.get(),
       active_host_.get(), tether_host_fetcher_.get(),
       ble_connection_manager_.get(), host_scan_device_prioritizer_.get(),
       device_id_tether_network_guid_map_.get());
+  network_configuration_remover_ =
+      base::MakeUnique<NetworkConfigurationRemover>(
+          network_state_handler_, managed_network_configuration_handler_);
+  tether_network_disconnection_handler_ =
+      base::MakeUnique<TetherNetworkDisconnectionHandler>(
+          active_host_.get(), network_state_handler_,
+          network_configuration_remover_.get());
   host_scanner_ = base::MakeUnique<HostScanner>(
       tether_host_fetcher_.get(), ble_connection_manager_.get(),
       host_scan_device_prioritizer_.get(), network_state_handler_,
       notification_presenter_.get(), device_id_tether_network_guid_map_.get());
 
   // TODO(khorimoto): Hook up HostScanScheduler. Currently, we simply start a
   // new scan once the user logs in.
   host_scanner_->StartScan();
 }
 
 void Initializer::OnBluetoothAdapterAdvertisingIntervalError(
     device::BluetoothAdvertisement::ErrorCode status) {
   PA_LOG(ERROR) << "Failed to set Bluetooth advertisement interval; "
                 << "cannot use tether feature. Error code: " << status;
 }
 
 }  // namespace tether
 
 }  // namespace chromeos