Merged Tether and cellular network types in System Tray.

chromeos/network/network_state_handler.cc

Index: chromeos/network/network_state_handler.cc
diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc
index bed774e33bbf93ca6b0d4aa92e3115a25a93619e..a00ed60dcfbafaf3970b8b4cdf9467bd1514071c 100644
--- a/chromeos/network/network_state_handler.cc
+++ b/chromeos/network/network_state_handler.cc
@@ -423,7 +423,8 @@ void NetworkStateHandler::GetNetworkListByType(const NetworkTypePattern& type,
   if (!network_list_sorted_)
     SortNetworkList();
 
-  if (type.MatchesPattern(NetworkTypePattern::Tether())) {
+  if (type.MatchesPattern(NetworkTypePattern::Tether()) &&
+      IsTechnologyEnabled(NetworkTypePattern::Tether())) {

[khorimoto, 2017/05/30 22:35:16]

I don't think this CL is the right place for this change. Theoretically, if
tether is not enabled, we shouldn't have any networks in tether_network_list_
anyway. If we do want to make this change, we should also add a change which
removes all tether networks from the list when the Tether DeviceState is changed
from "enabled" to another value.

stevenjb@, thoughts? :)

[stevenjb, 2017/05/30 23:23:14]

I think changing the behavior in this CL is OK, but we shouldn't check
IsTechnologyEnabled() here, that's an implementation detail of
GetTetherNetworkList(), which should always return an empty result of Tether is
disabled.

[lesliewatkins, 2017/05/31 00:43:27]

If this change isn't implemented, then the Tether network list appears in the
system tray even when Tether/Mobile is disabled.

[lesliewatkins, 2017/05/31 00:43:59]

Done.

     GetTetherNetworkList(limit, list);
   }