Settings: Network: Merge Tether networks into Mobile subpage

chrome/browser/chromeos/tether/tether_service_unittest.cc

 // Copyright 2017 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 "chrome/browser/chromeos/tether/tether_service.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
 #include "base/test/scoped_task_environment.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/network/network_connect.h"
@@ skipping 117 matching lines @@
     ShutdownNetworkState();
     chromeos::NetworkStateTest::TearDown();
     chromeos::DBusThreadManager::Shutdown();
   }
 
   void CreateTetherService() {
     tether_service_ = base::WrapUnique(new TestTetherService(
         profile_.get(), fake_power_manager_client_.get(),
         fake_session_manager_client_.get(), fake_cryptauth_service_.get(),
         network_state_handler()));
+    base::RunLoop().RunUntilIdle();
   }
 
   void ShutdownTetherService() {
     if (tether_service_)
       tether_service_->Shutdown();
   }
 
   void SetIsScreenLocked(bool is_screen_locked) {
     fake_session_manager_client_->set_is_screen_locked(is_screen_locked);
     if (is_screen_locked)
@@ skipping 74 matching lines @@
 
 TEST_F(TetherServiceTest, TestFeatureFlagDisabled) {
   EXPECT_FALSE(TetherService::Get(profile_.get()));
 }
 
 TEST_F(TetherServiceTest, TestFeatureFlagEnabled) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       chromeos::switches::kEnableTether);
 
   TetherService* tether_service = TetherService::Get(profile_.get());
-  EXPECT_TRUE(tether_service);
+  ASSERT_TRUE(tether_service);
+  base::RunLoop().RunUntilIdle();
   tether_service->Shutdown();
 }
 
 TEST_F(TetherServiceTest, TestNoTetherHosts) {
   ON_CALL(*mock_cryptauth_device_manager_, GetTetherHosts())
       .WillByDefault(Return(std::vector<cryptauth::ExternalDeviceInfo>()));
 
   CreateTetherService();
 
   EXPECT_EQ(
@@ skipping 46 matching lines @@
   EXPECT_TRUE(
       profile_->GetPrefs()->GetBoolean(prefs::kInstantTetheringEnabled));
 }
 
 // Test against a past defect that made TetherService and NetworkStateHandler
 // repeatly update technology state after the other did so. TetherService should
 // only update technology state if NetworkStateHandler has provided a different
 // state than the user preference.
 TEST_F(TetherServiceTest, TestEnabledMultipleChanges) {
   CreateTetherService();
-
-  EXPECT_EQ(0, tether_service_->updated_technology_state_count());
+  // CreateTetherService calls RunUntilIdle() so OnBluetoothAdapterFetched()
+  // will have been called which calls UpdateTetherTechnologyState().
+  EXPECT_EQ(1, tether_service_->updated_technology_state_count());
 
   SetTetherTechnologyStateEnabled(false);
   SetTetherTechnologyStateEnabled(false);
   SetTetherTechnologyStateEnabled(false);
 
-  EXPECT_EQ(1, tether_service_->updated_technology_state_count());
+  EXPECT_EQ(2, tether_service_->updated_technology_state_count());
 
   SetTetherTechnologyStateEnabled(true);
   SetTetherTechnologyStateEnabled(true);
   SetTetherTechnologyStateEnabled(true);
 
-  EXPECT_EQ(2, tether_service_->updated_technology_state_count());
+  EXPECT_EQ(3, tether_service_->updated_technology_state_count());
 }