[CrOS Tether] NetworkList: Remove code which erroneously added Tether networks twice.

ash/system/network/network_list.cc

 // Copyright 2016 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 "ash/system/network/network_list.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/metrics/user_metrics_recorder.h"
@@ skipping 300 matching lines @@
 }
 
 void NetworkListView::UpdateNetworkList() {
   CHECK(scroll_content());
 
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
 
   NetworkStateHandler::NetworkStateList network_list;
   handler->GetVisibleNetworkList(&network_list);
   UpdateNetworks(network_list);
-
-  // Add Tether networks.
-  NetworkStateHandler::NetworkStateList tether_network_list;
-  handler->GetVisibleNetworkListByType(NetworkTypePattern::Tether(),
-                                       &tether_network_list);
-  for (const auto* tether_network : tether_network_list) {
-    network_list_.push_back(
-        base::MakeUnique<NetworkInfo>(tether_network->guid()));
-  }
-
   UpdateNetworkIcons();
   UpdateNetworkListInternal();
 }
 
 bool NetworkListView::IsNetworkEntry(views::View* view,
                                      std::string* guid) const {
   std::map<views::View*, std::string>::const_iterator found =
       network_map_.find(view);
   if (found == network_map_.end())
     return false;
   *guid = found->second;
   return true;
 }
 
 void NetworkListView::UpdateNetworks(
     const NetworkStateHandler::NetworkStateList& networks) {
   SCOPED_NET_LOG_IF_SLOW();
   // |network_list_| contains all the info and is going to be cleared and
   // recreated. Save them to |last_network_info_map_|.
   last_network_info_map_.clear();
   for (auto& info : network_list_)
     last_network_info_map_[info->guid] = std::move(info);
 
   network_list_.clear();
   for (const auto* network : networks) {
     if (!NetworkTypePattern::NonVirtual().MatchesType(network->type()))
       continue;
-
-    // Do not add Wi-Fi networks that are associated with a Tether network.
-    if (NetworkTypePattern::WiFi().MatchesType(network->type()) &&
-        !network->tether_guid().empty())
-      continue;
-
     network_list_.push_back(base::MakeUnique<NetworkInfo>(network->guid()));
   }
 }
 
 void NetworkListView::UpdateNetworkIcons() {
   SCOPED_NET_LOG_IF_SLOW();
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
 
   // First, update state for all networks.
   bool animating = false;
@@ skipping 359 matching lines @@
       TriView::Container::CENTER, views::CreateEmptyBorder(gfx::Insets(
                                       0, 0, 0, kTrayPopupLabelRightPadding)));
 
   // Nothing to the right of the text.
   connection_warning->SetContainerVisible(TriView::Container::END, false);
   return connection_warning;
 }
 
 }  // namespace tray
 }  // namespace ash