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

chromeos/components/tether/initializer.h

Index: chromeos/components/tether/initializer.h
diff --git a/chromeos/components/tether/initializer.h b/chromeos/components/tether/initializer.h
index abb4e919600856ca3829727a8c876e84ed486b03..3d6c92f546a3d5fcde1f567e33dac85dec6acebc 100644
--- a/chromeos/components/tether/initializer.h
+++ b/chromeos/components/tether/initializer.h
@@ -25,6 +25,7 @@ class RemoteBeaconSeedFetcher;
 
 namespace chromeos {
 
+class ManagedNetworkConfigurationHandler;
 class NetworkConnect;
 class NetworkStateHandler;
 
@@ -37,9 +38,11 @@ class DeviceIdTetherNetworkGuidMap;
 class HostScanner;
 class HostScanDevicePrioritizer;
 class LocalDeviceDataProvider;
+class NetworkConfigurationRemover;
 class NotificationPresenter;
 class TetherConnector;
 class TetherHostFetcher;
+class TetherNetworkDisconnectionHandler;
 class WifiHotspotConnector;
 
 // Initializes the Tether Chrome OS component.
@@ -52,6 +55,7 @@ class Initializer : public OAuth2TokenService::Observer {
       PrefService* pref_service,
       ProfileOAuth2TokenService* token_service,
       NetworkStateHandler* network_state_handler,
+      ManagedNetworkConfigurationHandler* managed_network_configuration_handler,
       NetworkConnect* network_connect);
 
   // Shuts down the tether feature, destroying all internal classes. This should
@@ -65,12 +69,14 @@ class Initializer : public OAuth2TokenService::Observer {
 
   static Initializer* instance_;
 
-  Initializer(cryptauth::CryptAuthService* cryptauth_service,
-              std::unique_ptr<NotificationPresenter> notification_presenter,
-              PrefService* pref_service,
-              ProfileOAuth2TokenService* token_service,
-              NetworkStateHandler* network_state_handler,
-              NetworkConnect* network_connect);
+  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);
   ~Initializer() override;
 
   // OAuth2TokenService::Observer:
@@ -89,6 +95,7 @@ class Initializer : public OAuth2TokenService::Observer {
   PrefService* pref_service_;
   ProfileOAuth2TokenService* token_service_;
   NetworkStateHandler* network_state_handler_;
+  ManagedNetworkConfigurationHandler* managed_network_configuration_handler_;
   NetworkConnect* network_connect_;
 
   // Declare new objects in the order that they will be created during
@@ -107,6 +114,9 @@ class Initializer : public OAuth2TokenService::Observer {
   std::unique_ptr<DeviceIdTetherNetworkGuidMap>
       device_id_tether_network_guid_map_;
   std::unique_ptr<TetherConnector> tether_connector_;
+  std::unique_ptr<NetworkConfigurationRemover> network_configuration_remover_;
+  std::unique_ptr<TetherNetworkDisconnectionHandler>
+      tether_network_disconnection_handler_;
   std::unique_ptr<HostScanner> host_scanner_;
 
   base::WeakPtrFactory<Initializer> weak_ptr_factory_;