HostScanner: Add scanned hosts to NetworkStateHandler and NotificationPresenter.

BUG=672263

Review-Url: https://codereview.chromium.org/2781263004
Cr-Commit-Position: refs/heads/master@{#462745}

chromeos/components/tether/host_scan_scheduler_unittest.cc

@@ -82,7 +82,8 @@ class HostScanSchedulerTest : public testing::Test {
   class FakeHostScanner : public HostScanner {
    public:
     FakeHostScanner()
-        : HostScanner(nullptr, nullptr, nullptr), num_scans_started_(0) {}
+        : HostScanner(nullptr, nullptr, nullptr, nullptr, nullptr),
+          num_scans_started_(0) {}
     ~FakeHostScanner() override {}
 
     void StartScan() override { num_scans_started_++; }

chromeos/components/tether/host_scanner.cc

@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "chromeos/components/tether/tether_host_fetcher.h"
+#include "chromeos/network/network_state.h"
 #include "components/cryptauth/remote_device_loader.h"
 
 namespace chromeos {
@@ -15,10 +16,14 @@ namespace tether {
 HostScanner::HostScanner(
     TetherHostFetcher* tether_host_fetcher,
     BleConnectionManager* connection_manager,
-    HostScanDevicePrioritizer* host_scan_device_prioritizer)
+    HostScanDevicePrioritizer* host_scan_device_prioritizer,
+    NetworkStateHandler* network_state_handler,
+    NotificationPresenter* notification_presenter)
     : tether_host_fetcher_(tether_host_fetcher),
       connection_manager_(connection_manager),
       host_scan_device_prioritizer_(host_scan_device_prioritizer),
+      network_state_handler_(network_state_handler),
+      notification_presenter_(notification_presenter),
       is_fetching_hosts_(false),
       weak_ptr_factory_(this) {}
 
@@ -60,7 +65,23 @@ void HostScanner::OnTetherAvailabilityResponse(
     bool is_final_scan_result) {
   most_recent_scan_results_ = scanned_device_list_so_far;
 
-  // TODO(hansberry): Hook up to networking code.
+  if (!scanned_device_list_so_far.empty()) {
+    // TODO (hansberry): Clear out old scanned hosts from NetworkStateHandler.
+    // TODO (hansberry): Add battery and cell strength properties once
+    // available.
+    for (auto& scanned_device_info : scanned_device_list_so_far) {
+      cryptauth::RemoteDevice remote_device = scanned_device_info.remote_device;
+      network_state_handler_->AddTetherNetworkState(remote_device.GetDeviceId(),
+                                                    remote_device.name);
+    }
+
+    if (scanned_device_list_so_far.size() == 1) {
+      notification_presenter_->NotifyPotentialHotspotNearby(
+          scanned_device_list_so_far.at(0).remote_device);
+    } else {
+      notification_presenter_->NotifyMultiplePotentialHotspotsNearby();
+    }
+  }
 
   if (is_final_scan_result) {
     // If the final scan result has been received, the operation is finished.

chromeos/components/tether/host_scanner.h

@@ -9,6 +9,8 @@
 
 #include "base/memory/weak_ptr.h"
 #include "chromeos/components/tether/host_scanner_operation.h"
+#include "chromeos/components/tether/notification_presenter.h"
+#include "chromeos/network/network_state_handler.h"
 #include "components/cryptauth/remote_device.h"
 
 namespace chromeos {
@@ -28,7 +30,9 @@ class HostScanner : public HostScannerOperation::Observer {
  public:
   HostScanner(TetherHostFetcher* tether_host_fetcher,
               BleConnectionManager* connection_manager,
-              HostScanDevicePrioritizer* host_scan_device_prioritizer);
+              HostScanDevicePrioritizer* host_scan_device_prioritizer,
+              NetworkStateHandler* network_state_handler,
+              NotificationPresenter* notification_presenter);
   virtual ~HostScanner();
 
   // Starts a host scan if there is no current scan. If a scan is ongoing, this
@@ -56,6 +60,8 @@ class HostScanner : public HostScannerOperation::Observer {
   TetherHostFetcher* tether_host_fetcher_;
   BleConnectionManager* connection_manager_;
   HostScanDevicePrioritizer* host_scan_device_prioritizer_;
+  NetworkStateHandler* network_state_handler_;
+  NotificationPresenter* notification_presenter_;
 
   bool is_fetching_hosts_;
   std::unique_ptr<HostScannerOperation> host_scanner_operation_;

chromeos/components/tether/host_scanner_unittest.cc

@@ -9,9 +9,16 @@
 #include <vector>
 
 #include "base/memory/ptr_util.h"
+#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "chromeos/components/tether/fake_ble_connection_manager.h"
+#include "chromeos/components/tether/fake_notification_presenter.h"
 #include "chromeos/components/tether/fake_tether_host_fetcher.h"
 #include "chromeos/components/tether/host_scan_device_prioritizer.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/network/network_state.h"
+#include "chromeos/network/network_state_handler.h"
+#include "chromeos/network/network_state_test.h"
 #include "components/cryptauth/remote_device_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -119,7 +126,7 @@ CreateFakeScannedDeviceInfos(
 
 }  // namespace
 
-class HostScannerTest : public testing::Test {
+class HostScannerTest : public NetworkStateTest {
  protected:
   HostScannerTest()
       : test_devices_(cryptauth::GenerateTestRemoteDevices(4)),
@@ -127,6 +134,9 @@ class HostScannerTest : public testing::Test {
   }
 
   void SetUp() override {
+    DBusThreadManager::Initialize();
+    NetworkStateTest::SetUp();
+
     scanned_device_infos_so_far_.clear();
 
     fake_tether_host_fetcher_ = base::MakeUnique<FakeTetherHostFetcher>(
@@ -140,9 +150,19 @@ class HostScannerTest : public testing::Test {
     HostScannerOperation::Factory::SetInstanceForTesting(
         fake_host_scanner_operation_factory_.get());
 
+    fake_notification_presenter_ =
+        base::MakeUnique<FakeNotificationPresenter>();
+
     host_scanner_ = base::MakeUnique<HostScanner>(
         fake_tether_host_fetcher_.get(), fake_ble_connection_manager_.get(),
-        fake_host_scan_device_prioritizer_.get());
+        fake_host_scan_device_prioritizer_.get(), network_state_handler(),
+        fake_notification_presenter_.get());
+  }
+
+  void TearDown() override {
+    ShutdownNetworkState();
+    NetworkStateTest::TearDown();
+    DBusThreadManager::Shutdown();
   }
 
   // Causes |fake_operation| to receive the scan result in
@@ -158,8 +178,33 @@ class HostScannerTest : public testing::Test {
                                                 is_final_scan_result);
     EXPECT_EQ(scanned_device_infos_so_far_,
               host_scanner_->most_recent_scan_results());
+
+    NetworkStateHandler::NetworkStateList tether_networks;
+    network_state_handler()->GetTetherNetworkList(0 /* no limit */,
+                                                  &tether_networks);
+    EXPECT_EQ(scanned_device_infos_so_far_.size(), tether_networks.size());
+    for (auto& scanned_device_info : scanned_device_infos_so_far_) {
+      cryptauth::RemoteDevice remote_device = scanned_device_info.remote_device;
+      const NetworkState* tether_network =
+          network_state_handler()->GetNetworkStateFromGuid(
+              remote_device.GetDeviceId());
+      ASSERT_TRUE(tether_network);
+      EXPECT_EQ(remote_device.name, tether_network->name());
+    }
+
+    if (scanned_device_infos_so_far_.size() == 1) {
+      EXPECT_EQ(FakeNotificationPresenter::PotentialHotspotNotificationState::
+                    SINGLE_HOTSPOT_NEARBY_SHOWN,
+                fake_notification_presenter_->potential_hotspot_state());
+    } else {
+      EXPECT_EQ(FakeNotificationPresenter::PotentialHotspotNotificationState::
+                    MULTIPLE_HOTSPOTS_NEARBY_SHOWN,
+                fake_notification_presenter_->potential_hotspot_state());
+    }
   }
 
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
+
   const std::vector<cryptauth::RemoteDevice> test_devices_;
   const std::vector<HostScannerOperation::ScannedDeviceInfo>
       test_scanned_device_infos;
@@ -176,6 +221,8 @@ class HostScannerTest : public testing::Test {
 
   std::unique_ptr<HostScanner> host_scanner_;
 
+  std::unique_ptr<FakeNotificationPresenter> fake_notification_presenter_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(HostScannerTest);
 };