[CrOS Tether] Sort Tether network lists.

chromeos/components/tether/host_scanner_unittest.cc

Index: chromeos/components/tether/host_scanner_unittest.cc
diff --git a/chromeos/components/tether/host_scanner_unittest.cc b/chromeos/components/tether/host_scanner_unittest.cc
index bb17db4d7f687b45c7273dcd9b63a0179e1106b3..b11956d4cf4672d90430c2f48fcfee6b291d39b0 100644
--- a/chromeos/components/tether/host_scanner_unittest.cc
+++ b/chromeos/components/tether/host_scanner_unittest.cc
@@ -23,6 +23,7 @@
 #include "chromeos/components/tether/mock_tether_host_response_recorder.h"
 #include "chromeos/components/tether/proto_test_util.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/network/network_state_test.h"
 #include "components/cryptauth/remote_device_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -44,7 +45,11 @@ class TestObserver : public HostScanner::Observer {
 
 class FakeHostScanDevicePrioritizer : public HostScanDevicePrioritizer {
  public:
-  FakeHostScanDevicePrioritizer() : HostScanDevicePrioritizer(nullptr) {}
+  FakeHostScanDevicePrioritizer(NetworkStateHandler* network_state_handler)
+      : HostScanDevicePrioritizer(
+            network_state_handler,
+            nullptr /* tether_host_response_recorder */,
+            nullptr /* device_id_tether_network_guid_map */) {}
   ~FakeHostScanDevicePrioritizer() override {}
 
   // Simply leave |remote_devices| as-is.
@@ -176,7 +181,7 @@ CreateFakeScannedDeviceInfos(
 
 }  // namespace
 
-class HostScannerTest : public testing::Test {
+class HostScannerTest : public NetworkStateTest {
  protected:
   HostScannerTest()
       : test_devices_(cryptauth::GenerateTestRemoteDevices(4)),
@@ -184,13 +189,17 @@ 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>(
         test_devices_, false /* synchronously_reply_with_results */);
     fake_ble_connection_manager_ = base::MakeUnique<FakeBleConnectionManager>();
     fake_host_scan_device_prioritizer_ =
-        base::MakeUnique<FakeHostScanDevicePrioritizer>();
+        base::MakeUnique<FakeHostScanDevicePrioritizer>(
+            network_state_handler());
     mock_tether_host_response_recorder_ =
         base::MakeUnique<MockTetherHostResponseRecorder>();
     fake_notification_presenter_ =
@@ -221,6 +230,11 @@ class HostScannerTest : public testing::Test {
   void TearDown() override {
     host_scanner_->RemoveObserver(test_observer_.get());
     HostScannerOperation::Factory::SetInstanceForTesting(nullptr);
+
+    fake_host_scan_device_prioritizer_.reset();
+    ShutdownNetworkState();
+    NetworkStateTest::TearDown();
+    DBusThreadManager::Shutdown();
   }
 
   // Causes |fake_operation| to receive the scan result in
@@ -305,6 +319,7 @@ class HostScannerTest : public testing::Test {
     EXPECT_EQ(scanned_device_info.setup_required, cache_item.setup_required);
   }
 
+  const base::test::ScopedTaskEnvironment scoped_task_environment_;
   const std::vector<cryptauth::RemoteDevice> test_devices_;
   const std::vector<HostScannerOperation::ScannedDeviceInfo>
       test_scanned_device_infos;