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

chromeos/components/tether/tether_network_disconnection_handler.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_network_disconnection_handler.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "components/proximity_auth/logging/logging.h"
 
+namespace {
+
+void RemoveConfigurationSuccessCallback() {
+  PA_LOG(INFO) << "Successfully removed Wi-Fi network.";

[Kyle Horimoto, 2017/04/17 20:34:53]

Add more information to this log. Since the callback doesn't accept a parameter,
just add one here and add pass the parameter to base::Bind() below.

Same for the failure callback.

[Ryan Hansberry, 2017/04/20 20:57:58]

Done.

+}
+
+void RemoveConfigurationFailureCallback(
+    const std::string& error_name,
+    std::unique_ptr<base::DictionaryValue> error_data) {
+  PA_LOG(WARNING) << "Failed to remove Wi-Fi network: " << error_name;
+}
+
+}  // namespace
+
 namespace chromeos {
 
 namespace tether {
 
 TetherNetworkDisconnectionHandler::TetherNetworkDisconnectionHandler(
-    ActiveHost* active_host)
-    : TetherNetworkDisconnectionHandler(
-          active_host,
-          NetworkHandler::Get()->network_state_handler()) {}
-
-TetherNetworkDisconnectionHandler::TetherNetworkDisconnectionHandler(
     ActiveHost* active_host,
-    NetworkStateHandler* network_state_handler)
-    : active_host_(active_host), network_state_handler_(network_state_handler) {
+    NetworkStateHandler* network_state_handler,
+    ManagedNetworkConfigurationHandler* managed_network_configuration_handler)
+    : active_host_(active_host),
+      network_state_handler_(network_state_handler),
+      managed_network_configuration_handler_(
+          managed_network_configuration_handler) {
   network_state_handler_->AddObserver(this, FROM_HERE);
 }
 
 TetherNetworkDisconnectionHandler::~TetherNetworkDisconnectionHandler() {
   network_state_handler_->RemoveObserver(this, FROM_HERE);
 }
 
 void TetherNetworkDisconnectionHandler::NetworkConnectionStateChanged(
     const NetworkState* network) {
   // Note: |active_host_->GetWifiNetworkGuid()| returns "" unless currently
   // connected, so this if() statement is only entered on disconnections.
   if (network->guid() == active_host_->GetWifiNetworkGuid() &&
       !network->IsConnectedState()) {
     PA_LOG(INFO) << "Connection to active host (Wi-Fi network GUID "
                  << network->guid() << ") has been lost.";
+
+    managed_network_configuration_handler_->RemoveConfiguration(

[Kyle Horimoto, 2017/04/17 20:34:53]

Can you actually move this functionality to a new file and call it from here?
This logic needs to be shared with other parts of the tether component (e.g., it
should be called when the user manually disconnects or when the user logs out).

[stevenjb, 2017/04/18 21:03:36]

Do we really want to remove the configuration on any disconnect, e.g. every time
the user walks away with their phone? It means we would need to check for an
existing configuration before creating a new one, but that seems better than
regenerating the configuration each time?

[Kyle Horimoto, 2017/04/18 21:14:00]

Yes, we do want to remove the configuration on any disconnect. While it is
possible to lose a connection by physically moving out of range of the phone,
that is an edge case. The common cause of disconnections is the hotspot being
shut down on the phone side (due either to lack of Internet traffic or due to
the user explicitly shutting it down). Once the hotspot is shut down, a new SSID
and password are generated the next time that tethering starts up, so the old
configuration is no longer valid. We should assume that the configuration will
never be used again once a disconnection occurs.

[Ryan Hansberry, 2017/04/20 20:57:57]

Done.

+        network->path(), base::Bind(RemoveConfigurationSuccessCallback),
+        base::Bind(RemoveConfigurationFailureCallback));
+
     active_host_->SetActiveHostDisconnected();
-
-    // TODO(hansberry): Remove Wi-Fi network from "known" networks.
   }
 }
 
 }  // namespace tether
 
 }  // namespace chromeos