[CrOS Tether] Sort Tether network lists.

chromeos/components/tether/initializer.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 "chromeos/components/tether/initializer.h"
 
 #include "base/bind.h"
 #include "chromeos/components/tether/active_host.h"
 #include "chromeos/components/tether/active_host_network_state_updater.h"
 #include "chromeos/components/tether/ble_connection_manager.h"
 #include "chromeos/components/tether/device_id_tether_network_guid_map.h"
 #include "chromeos/components/tether/host_scan_cache.h"
-#include "chromeos/components/tether/host_scan_device_prioritizer.h"
+#include "chromeos/components/tether/host_scan_device_prioritizer_impl.h"
 #include "chromeos/components/tether/host_scan_scheduler.h"
 #include "chromeos/components/tether/host_scanner.h"
 #include "chromeos/components/tether/keep_alive_scheduler.h"
 #include "chromeos/components/tether/local_device_data_provider.h"
 #include "chromeos/components/tether/network_configuration_remover.h"
 #include "chromeos/components/tether/network_connection_handler_tether_delegate.h"
 #include "chromeos/components/tether/notification_presenter.h"
 #include "chromeos/components/tether/tether_connector.h"
 #include "chromeos/components/tether/tether_disconnector.h"
 #include "chromeos/components/tether/tether_host_fetcher.h"
@@ skipping 99 matching lines @@
     token_service_->AddObserver(this);
     return;
   }
 
   PA_LOG(INFO) << "Refresh token is available; initializing tether feature.";
   FetchBluetoothAdapter();
 }
 
 Initializer::~Initializer() {
   token_service_->RemoveObserver(this);
+  network_state_handler_->set_tether_sort_delegate(nullptr);
 }
 
 void Initializer::FetchBluetoothAdapter() {
   device::BluetoothAdapterFactory::GetAdapter(base::Bind(
       &Initializer::OnBluetoothAdapterFetched, weak_ptr_factory_.GetWeakPtr()));
 }
 
 void Initializer::OnRefreshTokensLoaded() {
   if (!token_service_->RefreshTokenIsAvailable(
           cryptauth_service_->GetAccountId())) {
@@ skipping 33 matching lines @@
       base::MakeUnique<LocalDeviceDataProvider>(cryptauth_service_);
   remote_beacon_seed_fetcher_ =
       base::MakeUnique<cryptauth::RemoteBeaconSeedFetcher>(
           cryptauth_service_->GetCryptAuthDeviceManager());
   ble_connection_manager_ = base::MakeUnique<BleConnectionManager>(
       cryptauth_service_, adapter, local_device_data_provider_.get(),
       remote_beacon_seed_fetcher_.get(),
       cryptauth::BluetoothThrottlerImpl::GetInstance());
   tether_host_response_recorder_ =
       base::MakeUnique<TetherHostResponseRecorder>(pref_service_);
-  host_scan_device_prioritizer_ = base::MakeUnique<HostScanDevicePrioritizer>(
-      tether_host_response_recorder_.get());
+  device_id_tether_network_guid_map_ =
+      base::MakeUnique<DeviceIdTetherNetworkGuidMap>();
+  host_scan_device_prioritizer_ =
+      base::MakeUnique<HostScanDevicePrioritizerImpl>(
+          tether_host_response_recorder_.get(),
+          device_id_tether_network_guid_map_.get());
+  network_state_handler_->set_tether_sort_delegate(
+      host_scan_device_prioritizer_.get());
   wifi_hotspot_connector_ = base::MakeUnique<WifiHotspotConnector>(
       network_state_handler_, network_connect_);
   active_host_ =
       base::MakeUnique<ActiveHost>(tether_host_fetcher_.get(), pref_service_);
   active_host_network_state_updater_ =
       base::MakeUnique<ActiveHostNetworkStateUpdater>(active_host_.get(),
                                                       network_state_handler_);
-  device_id_tether_network_guid_map_ =
-      base::MakeUnique<DeviceIdTetherNetworkGuidMap>();
   host_scan_cache_ = base::MakeUnique<HostScanCache>(
       network_state_handler_, active_host_.get(),
       tether_host_response_recorder_.get(),
       device_id_tether_network_guid_map_.get());
   keep_alive_scheduler_ = base::MakeUnique<KeepAliveScheduler>(
       active_host_.get(), ble_connection_manager_.get(), host_scan_cache_.get(),
       device_id_tether_network_guid_map_.get());
   clock_ = base::MakeUnique<base::DefaultClock>();
   host_scanner_ = base::MakeUnique<HostScanner>(
       tether_host_fetcher_.get(), ble_connection_manager_.get(),
@@ skipping 32 matching lines @@
 
 void Initializer::OnBluetoothAdapterAdvertisingIntervalError(
     device::BluetoothAdvertisement::ErrorCode status) {
   PA_LOG(ERROR) << "Failed to set Bluetooth advertisement interval; "
                 << "cannot use tether feature. Error code: " << status;
 }
 
 }  // namespace tether
 
 }  // namespace chromeos