| Index: chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
|
| diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
|
| index 9a11a9526f90173631819613cce7f947cdc67116..4443236315667986213c9944207e902a12db999b 100644
|
| --- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
|
| +++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
|
| @@ -13,6 +13,7 @@
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| #include "base/message_loop/message_loop.h"
|
| +#include "base/run_loop.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "chrome/browser/chromeos/net/proxy_config_handler.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings.h"
|
| @@ -254,7 +255,7 @@ class ProxyConfigServiceImplTest : public testing::Test {
|
| // CreateTrackingProxyConfigService triggers update of initial prefs proxy
|
| // config by tracker to chrome proxy config service, so flush all pending
|
| // tasks so that tests start fresh.
|
| - loop_.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| void SetUpPrivateWiFi() {
|
| @@ -264,7 +265,7 @@ class ProxyConfigServiceImplTest : public testing::Test {
|
| DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
|
|
|
| // Process any pending notifications before clearing services.
|
| - loop_.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| service_test->ClearServices();
|
|
|
| // Sends a notification about the added profile.
|
| @@ -277,7 +278,7 @@ class ProxyConfigServiceImplTest : public testing::Test {
|
| true /* visible */);
|
| profile_test->AddService(kUserProfilePath, "/service/stub_wifi2");
|
|
|
| - loop_.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| void SetUpSharedEthernet() {
|
| @@ -287,7 +288,7 @@ class ProxyConfigServiceImplTest : public testing::Test {
|
| DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
|
|
|
| // Process any pending notifications before clearing services.
|
| - loop_.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| service_test->ClearServices();
|
|
|
| // Sends a notification about the added profile.
|
| @@ -299,12 +300,12 @@ class ProxyConfigServiceImplTest : public testing::Test {
|
| profile_test->AddService(NetworkProfileHandler::GetSharedProfilePath(),
|
| "/service/ethernet");
|
|
|
| - loop_.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| void TearDown() override {
|
| config_service_impl_->DetachFromPrefService();
|
| - loop_.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| config_service_impl_.reset();
|
| proxy_config_service_.reset();
|
| NetworkHandler::Shutdown();
|
| @@ -355,7 +356,7 @@ class ProxyConfigServiceImplTest : public testing::Test {
|
| // Let message loop process all messages. This will run
|
| // ChromeProxyConfigService::UpdateProxyConfig, which is posted on IO from
|
| // PrefProxyConfigTrackerImpl::OnProxyConfigChanged.
|
| - loop_.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| net::ProxyConfigService::ConfigAvailability availability =
|
| proxy_config_service_->GetLatestProxyConfig(config);
|
|
|
|
|