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..4e91fe7905d1991eca70d5cdbc92e4ca53b3d261 100644
--- a/chromeos/network/network_state_handler.cc
+++ b/chromeos/network/network_state_handler.cc
@@ -423,9 +423,8 @@ void NetworkStateHandler::GetNetworkListByType(const NetworkTypePattern& type,
   if (!network_list_sorted_)
     SortNetworkList();
 
-  if (type.MatchesPattern(NetworkTypePattern::Tether())) {
+  if (type.MatchesPattern(NetworkTypePattern::Tether()))
     GetTetherNetworkList(limit, list);
-  }
 
   int count = list->size();
 
@@ -463,6 +462,9 @@ void NetworkStateHandler::GetTetherNetworkList(int limit,
   list->clear();
   int count = 0;
 
+  if (!IsTechnologyEnabled(NetworkTypePattern::Tether()))

[Kyle Horimoto, 2017/05/31 20:13:59]

nit: Move the "int count" line below this early return.

[lesliewatkins, 2017/05/31 22:06:28]

Done.

+    return;
+
   for (auto iter = tether_network_list_.begin();
        iter != tether_network_list_.end(); ++iter) {
     list->push_back((*iter)->AsNetworkState());