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

chromeos/network/network_state_handler.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 "base/bind.h"
 #include "base/command_line.h"
@@ skipping 606 matching lines @@
     } else {
       managed_list->push_back(std::move(found->second));
       managed_map.erase(found);
     }
     list_entries.insert(path);
   }
 
   if (type != ManagedState::ManagedType::MANAGED_TYPE_NETWORK)
     return;
 
-  // Remove associations Tether NetworkStates had with now removed Wi-Fi
-  // NetworkStates.
+  // If a Wi-Fi NetworkState was removed, also remove its associated
+  // TetherNetworkState (if it has one).
   for (auto& iter : managed_map) {
-    if (!iter.second->Matches(NetworkTypePattern::WiFi()))
-      continue;
-
-    NetworkState* tether_network = GetModifiableNetworkStateFromGuid(
-        iter.second->AsNetworkState()->tether_guid());
-    if (tether_network)
-      tether_network->set_tether_guid(std::string());
+    if (iter.second->Matches(NetworkTypePattern::WiFi())) {
+      std::string tether_network_guid =
+          iter.second->AsNetworkState()->tether_guid();
+      if (!tether_network_guid.empty())
+        RemoveTetherNetworkState(tether_network_guid);

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

I don't think this should be a responsibility of NetworkStateHandler. Since the
tether component is adding the network, I think it should also remove the
network when it no longer needs it. NetworkStateHandler should just clear the
GUID as it did before this CL. Let's revert the changes to this file and move
the RemoveTetherNetworkState() call to the tether component.

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

+1. That allows the Tether code to make the decision whether to remove a Tether
network when it's associated WiFi network goes out of range, or keep it around
and update it's state (e.g. to 'out of range').

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

Done.

+    }
   }
 }
 
 void NetworkStateHandler::ProfileListChanged() {
   NET_LOG_EVENT("ProfileListChanged", "Re-Requesting Network Properties");
   for (ManagedStateList::iterator iter = network_list_.begin();
        iter != network_list_.end(); ++iter) {
     NetworkState* network = (*iter)->AsNetworkState();
     DCHECK(network);
     shill_property_handler_->RequestProperties(
@@ skipping 521 matching lines @@
   if (type.MatchesType(shill::kTypeBluetooth))
     technologies.emplace_back(shill::kTypeBluetooth);
   if (type.MatchesType(shill::kTypeVPN))
     technologies.emplace_back(shill::kTypeVPN);
 
   CHECK_GT(technologies.size(), 0ul);
   return technologies;
 }
 
 }  // namespace chromeos