(Fix landed) Revert of [CrOS Tether] Create HostScanCache, which caches scan results and inserts...

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_scheduler.h"
 #include "chromeos/components/tether/host_scanner.h"
 #include "chromeos/components/tether/local_device_data_provider.h"
 #include "chromeos/components/tether/network_configuration_remover.h"
 #include "chromeos/components/tether/notification_presenter.h"
 #include "chromeos/components/tether/tether_connector.h"
 #include "chromeos/components/tether/tether_device_state_manager.h"
 #include "chromeos/components/tether/tether_host_fetcher.h"
 #include "chromeos/components/tether/tether_host_response_recorder.h"
@@ skipping 177 matching lines @@
       tether_host_fetcher_.get(), ble_connection_manager_.get(),
       tether_host_response_recorder_.get(),
       device_id_tether_network_guid_map_.get());
   network_configuration_remover_ =
       base::MakeUnique<NetworkConfigurationRemover>(
           network_state_handler_, managed_network_configuration_handler_);
   tether_network_disconnection_handler_ =
       base::MakeUnique<TetherNetworkDisconnectionHandler>(
           active_host_.get(), network_state_handler_,
           network_configuration_remover_.get());
-  host_scan_cache_ = base::MakeUnique<HostScanCache>(
-      network_state_handler_, active_host_.get(),
-      tether_host_response_recorder_.get(),
-      device_id_tether_network_guid_map_.get());
   host_scanner_ = base::MakeUnique<HostScanner>(
       tether_host_fetcher_.get(), ble_connection_manager_.get(),
       host_scan_device_prioritizer_.get(), tether_host_response_recorder_.get(),
-      notification_presenter_.get(), device_id_tether_network_guid_map_.get(),
-      host_scan_cache_.get());
+      network_state_handler_, notification_presenter_.get(),
+      device_id_tether_network_guid_map_.get());
 
   // TODO(khorimoto): Hook up HostScanScheduler. Currently, we simply start a
   // new scan once the user logs in.
   host_scanner_->StartScan();
 }
 
 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