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 6bf34633966a6ab6f7c18cac0380f20c4218571e..fbc3612cfd91deb06ed95adcd5debbd747ceddbc 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();
 
@@ -461,8 +460,11 @@ void NetworkStateHandler::GetTetherNetworkList(int limit,
                                                NetworkStateList* list) {
   DCHECK(list);
   list->clear();
-  int count = 0;
 
+  if (!IsTechnologyEnabled(NetworkTypePattern::Tether()))
+    return;
+
+  int count = 0;
   for (auto iter = tether_network_list_.begin();
        iter != tether_network_list_.end(); ++iter) {
     list->push_back((*iter)->AsNetworkState());