Remove MessageLoop::current()->RunUntilIdle() in chrome.
This CL replaces MessageLoop::current()->RunUntilIdle() with
RunLoop().RunUntilIdle() in chrome.
In files where this replacement is made, it adds this include:
#include "base/run_loop.h"
And removes this include if it is no longer required:
#include "base/message_loop/message_loop.h"
Why?
- The fact that there's a MessageLoop on the thread is an
unnecessary implementation detail. When browser threads
are migrated to base/task_scheduler, tasks will no longer
have access to a MessageLoop but they will be able to use
RunLoop.
- MessageLoop::RunUntilIdle() is deprecated.
Steps to generate this patch:
1. Run message_loop_cleanup_3.py (see code on the bug).
2. Run tools/sort-headers.py on modified files.
3. Run git cl format.
BUG=616447
[email protected]
Review-Url: https://codereview.chromium.org/2053103002
Cr-Commit-Position: refs/heads/master@{#399221}
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index 5ee145e3..a29ede13 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -14,6 +14,7 @@
#include "base/macros.h"
#include "base/path_service.h"
#include "base/process/process.h"
+#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
@@ -3235,7 +3236,7 @@
void WaitForScrollChange(gfx::Vector2dF target_offset) {
while (target_offset != host_view_->GetLastScrollOffset())
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
private:
diff --git a/chrome/browser/background/background_mode_manager_unittest.cc b/chrome/browser/background/background_mode_manager_unittest.cc
index cabc5b2e..ab89237 100644
--- a/chrome/browser/background/background_mode_manager_unittest.cc
+++ b/chrome/browser/background/background_mode_manager_unittest.cc
@@ -12,7 +12,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_simple_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -259,7 +259,7 @@
Mock::VerifyAndClearExpectations(manager_.get());
// We're getting ready to shutdown the message loop. Clear everything out!
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
test_keep_alive_.reset();
diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
index ac0156f..e1ffaa1 100644
--- a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
@@ -11,7 +11,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "chrome/browser/browsing_data/browsing_data_quota_helper_impl.h"
#include "content/public/test/mock_storage_client.h"
#include "content/public/test/test_browser_thread.h"
@@ -46,7 +46,7 @@
helper_ = nullptr;
quota_manager_ = nullptr;
quota_info_.clear();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
protected:
@@ -124,7 +124,7 @@
TEST_F(BrowsingDataQuotaHelperTest, Empty) {
StartFetching();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(fetching_completed());
EXPECT_TRUE(quota_info().empty());
}
@@ -140,7 +140,7 @@
RegisterClient(kOrigins, arraysize(kOrigins));
StartFetching();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(fetching_completed());
std::set<QuotaInfo> expected, actual;
@@ -169,7 +169,7 @@
RegisterClient(kOrigins, arraysize(kOrigins));
StartFetching();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(fetching_completed());
std::set<QuotaInfo> expected, actual;
@@ -185,16 +185,16 @@
SetPersistentHostQuota(kHost1, 1);
SetPersistentHostQuota(kHost2, 10);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
RevokeHostQuota(kHost1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
GetPersistentHostQuota(kHost1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(0, quota());
GetPersistentHostQuota(kHost2);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(10, quota());
}
diff --git a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
index 3141e25..1170490 100644
--- a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
@@ -7,7 +7,7 @@
#include <string>
#include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h"
#include "chrome/browser/browsing_data/mock_browsing_data_cache_storage_helper.h"
@@ -52,7 +52,7 @@
special_storage_policy_ = nullptr;
#endif
profile_.reset();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
void SetUp() override {
@@ -106,7 +106,7 @@
mock_browsing_data_local_storage_helper_ = nullptr;
mock_browsing_data_database_helper_ = nullptr;
mock_browsing_data_flash_lso_helper_ = nullptr;
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
std::unique_ptr<CookiesTreeModel> CreateCookiesTreeModelWithInitialSample() {
diff --git a/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc b/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc
index 07103607..4b66d4a2 100644
--- a/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc
+++ b/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc
@@ -6,7 +6,7 @@
#include "base/callback.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "chrome/browser/captive_portal/captive_portal_service.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "content/public/browser/interstitial_page.h"
@@ -117,7 +117,7 @@
EXPECT_TRUE(tab_reloader().TimerRunning());
EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(tab_reloader().TimerRunning());
EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
tab_reloader().state());
@@ -167,7 +167,7 @@
EXPECT_TRUE(tab_reloader().TimerRunning());
EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(tab_reloader().TimerRunning());
EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
tab_reloader().state());
@@ -211,7 +211,7 @@
tab_reloader().OnLoadStart(true);
EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(tab_reloader().TimerRunning());
EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
tab_reloader().state());
@@ -239,7 +239,7 @@
tab_reloader().state());
EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
}
@@ -249,7 +249,7 @@
tab_reloader().OnLoadStart(true);
EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(tab_reloader().TimerRunning());
EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
tab_reloader().state());
@@ -373,7 +373,7 @@
// The error page commits, which should trigger a reload.
EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
tab_reloader().OnLoadCommitted(net::ERR_SSL_PROTOCOL_ERROR);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
}
@@ -384,7 +384,7 @@
tab_reloader().OnLoadStart(true);
EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(tab_reloader().TimerRunning());
EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
tab_reloader().state());
@@ -403,7 +403,7 @@
tab_reloader().state());
EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
}
@@ -428,7 +428,7 @@
tab_reloader().state());
EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
}
@@ -453,7 +453,7 @@
tab_reloader().state());
EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
}
@@ -476,7 +476,7 @@
// The rest proceeds as normal.
EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
tab_reloader().state());
@@ -503,7 +503,7 @@
tab_reloader().state());
EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
}
@@ -565,7 +565,7 @@
TEST_F(CaptivePortalTabReloaderTest, HttpToHttpsRedirectInternetConnected) {
tab_reloader().OnLoadStart(false);
// There should be no captive portal check pending.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// HTTP to HTTPS redirect.
tab_reloader().OnRedirect(true);
@@ -574,7 +574,7 @@
EXPECT_TRUE(tab_reloader().TimerRunning());
EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(tab_reloader().TimerRunning());
EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
tab_reloader().state());
@@ -595,7 +595,7 @@
TEST_F(CaptivePortalTabReloaderTest, HttpToHttpsRedirectLogin) {
tab_reloader().OnLoadStart(false);
// There should be no captive portal check pending.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// HTTP to HTTPS redirect.
tab_reloader().OnRedirect(true);
@@ -603,7 +603,7 @@
tab_reloader().state());
EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(tab_reloader().TimerRunning());
EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
tab_reloader().state());
@@ -631,7 +631,7 @@
tab_reloader().state());
EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
}
@@ -647,7 +647,7 @@
EXPECT_FALSE(tab_reloader().TimerRunning());
// There should be no captive portal check pending after the redirect.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Logging in shouldn't do anything.
tab_reloader().OnCaptivePortalResults(
@@ -666,7 +666,7 @@
EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
EXPECT_FALSE(tab_reloader().TimerRunning());
// Nothing should happen.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
// Check that an HTTPS to HTTP to HTTPS redirect results in no timer running.
@@ -683,7 +683,7 @@
EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
EXPECT_FALSE(tab_reloader().TimerRunning());
// Nothing should happen.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
// Check that an HTTP to HTTP redirect results in the timer not running.
@@ -696,7 +696,7 @@
EXPECT_FALSE(tab_reloader().TimerRunning());
// There should be no captive portal check pending after the redirect.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Logging in shouldn't do anything.
tab_reloader().OnCaptivePortalResults(
diff --git a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc
index 6a4e1d7..202d2ce 100644
--- a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc
+++ b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc
@@ -244,7 +244,7 @@
net::TestURLFetcherFactory factory;
EXPECT_CALL(visitor_, OnExternalProviderReady(provider_.get()))
.Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Verify that a downloader has started and is attempting to download an
// update manifest.
diff --git a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
index 656d8e5..5667ed2c 100644
--- a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
@@ -297,7 +297,7 @@
void RunResolve(CryptohomeAuthenticator* auth) {
auth->Resolve();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
void SetAttemptState(CryptohomeAuthenticator* auth, TestAttemptState* state) {
diff --git a/chrome/browser/chromeos/login/enable_debugging_browsertest.cc b/chrome/browser/chromeos/login/enable_debugging_browsertest.cc
index 6f2a2508..5a562e2 100644
--- a/chrome/browser/chromeos/login/enable_debugging_browsertest.cc
+++ b/chrome/browser/chromeos/login/enable_debugging_browsertest.cc
@@ -8,6 +8,7 @@
#include "base/json/json_file_value_serializer.h"
#include "base/location.h"
#include "base/path_service.h"
+#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/browser_process.h"
@@ -234,7 +235,7 @@
InvokeEnableDebuggingScreen();
JSExpect("!document.querySelector('#debugging.hidden')");
debug_daemon_client_->WaitUntilCalled();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
VerifyRemoveProtectionScreen();
}
@@ -253,7 +254,7 @@
InvokeEnableDebuggingScreen();
JSExpect("!document.querySelector('#debugging.hidden')");
debug_daemon_client_->WaitUntilCalled();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
JSExpect("!document.querySelector('#debugging.remove-protection-view')");
JSExpect("!!document.querySelector('#debugging.setup-view')");
JSExpect("!document.querySelector('#debugging.done-view')");
@@ -284,7 +285,7 @@
debug_daemon_client_->WaitUntilCalled();
JSExpect("!!document.querySelector('#debugging.wait-view')");
// Check if we have rebooted after enabling.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(debug_daemon_client_->num_remove_protection(), 1);
EXPECT_EQ(debug_daemon_client_->num_enable_debugging_features(), 0);
EXPECT_EQ(power_manager_client_->num_request_restart_calls(), 1);
@@ -297,7 +298,7 @@
debug_daemon_client_->ResetWait();
ClickEnableButton();
debug_daemon_client_->WaitUntilCalled();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
JSExpect("!!document.querySelector('#debugging.done-view')");
EXPECT_EQ(debug_daemon_client_->num_enable_debugging_features(), 1);
EXPECT_EQ(debug_daemon_client_->num_remove_protection(), 0);
@@ -314,7 +315,7 @@
InvokeEnableDebuggingScreen();
JSExpect("!document.querySelector('#debugging.hidden')");
debug_daemon_client_->WaitUntilCalled();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
VerifyRemoveProtectionScreen();
EXPECT_EQ(debug_daemon_client_->num_query_debugging_features(), 1);
@@ -338,7 +339,7 @@
// Mark service ready and it should proceed to remove protection view.
debug_daemon_client_->SetServiceIsAvailable(true);
debug_daemon_client_->WaitUntilCalled();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
VerifyRemoveProtectionScreen();
}
@@ -367,7 +368,7 @@
JSExpect("!!document.querySelector('#debugging.hidden')");
InvokeEnableDebuggingScreen();
JSExpect("!document.querySelector('#debugging.hidden')");
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
JSExpect("!!document.querySelector('#debugging.error-view')");
JSExpect("!document.querySelector('#debugging.remove-protection-view')");
JSExpect("!document.querySelector('#debugging.setup-view')");
diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
index cd0c609b..50529b1 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -436,7 +436,7 @@
if (LoginDisplayHost::default_host())
LoginDisplayHost::default_host()->Finalize();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
void ExpectSuccessfulLogin(const UserContext& user_context) {
diff --git a/chrome/browser/chromeos/login/login_manager_test.cc b/chrome/browser/chromeos/login/login_manager_test.cc
index c7d15b8..bd235d97 100644
--- a/chrome/browser/chromeos/login/login_manager_test.cc
+++ b/chrome/browser/chromeos/login/login_manager_test.cc
@@ -11,6 +11,7 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/path_service.h"
+#include "base/run_loop.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
@@ -95,7 +96,7 @@
MixinBasedBrowserTest::TearDownOnMainThread();
if (LoginDisplayHost::default_host())
LoginDisplayHost::default_host()->Finalize();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(embedded_test_server()->ShutdownAndWaitUntilComplete());
}
diff --git a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
index 51bd3a65..d08ad8c 100644
--- a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
@@ -8,6 +8,7 @@
#include "base/command_line.h"
#include "base/macros.h"
+#include "base/run_loop.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
#include "chrome/browser/chromeos/login/screens/mock_error_screen.h"
@@ -179,7 +180,7 @@
// UpdateStatusChanged(status) calls RebootAfterUpdate().
EXPECT_EQ(1, fake_update_engine_client_->reboot_after_update_call_count());
// Check that OOBE will resume back at this screen.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(StartupUtils::IsOobeCompleted());
EXPECT_EQ(update_screen_->GetName(),
g_browser_process->local_state()->GetString(prefs::kOobeScreenPending));
@@ -355,7 +356,7 @@
MockSetErrorState(NetworkError::ERROR_STATE_OFFLINE,
std::string())).Times(1);
EXPECT_CALL(*mock_base_screen_delegate_, ShowErrorScreen()).Times(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
NotifyPortalDetectionCompleted();
}
@@ -403,7 +404,7 @@
_)).Times(1);
update_screen_->OnConnectRequested();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
} // namespace chromeos
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc b/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
index 8ec08ab..092486e 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
@@ -750,7 +750,7 @@
disable_error_screen_strategy();
// To run CaptivePortalDetector::DetectCaptivePortal().
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ASSERT_TRUE(MakeResultHistogramChecker()->Check());
}
diff --git a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc
index b25dbf6..b9f505a 100644
--- a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc
@@ -10,6 +10,7 @@
#include "base/bind_helpers.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
+#include "base/run_loop.h"
#include "base/time/time.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
@@ -417,7 +418,7 @@
service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner,
base::Unretained(this)));
// The callback should be called immediately.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey());
ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
diff --git a/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc b/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc
index cdb9204..3ebc237 100644
--- a/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc
+++ b/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc
@@ -6,6 +6,7 @@
#include "base/command_line.h"
#include "base/macros.h"
+#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/test_extension_system.h"
@@ -63,7 +64,7 @@
void TearDown() override {
// The destruction of the widget might be a delayed task.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
BrowserWithTestWindowTest::TearDown();
}
@@ -100,7 +101,7 @@
// Wait now for some time and see that it closes itself again.
for (int i = 0; i < 50 && message->IsVisible(); i++) {
sleep(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
EXPECT_FALSE(message->IsVisible());
}
diff --git a/chrome/browser/extensions/activity_log/activity_database_unittest.cc b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
index 62f948aa..7a69b0d8 100644
--- a/chrome/browser/extensions/activity_log/activity_database_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
@@ -243,7 +243,7 @@
// Artificially trigger and then stop the timer.
activity_db->SetTimerForTesting(0);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ASSERT_EQ(1, CountActions(&activity_db->db_, "brewster"));
activity_db->Close();
diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc
index 8e9d8ebe..7728d91 100644
--- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc
+++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc
@@ -9,6 +9,7 @@
#include "base/macros.h"
#include "base/path_service.h"
+#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/login/test/https_forwarder.h"
@@ -327,7 +328,7 @@
if (chromeos::LoginDisplayHost::default_host())
chromeos::LoginDisplayHost::default_host()->Finalize();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
if (GetParam().system_token_ == SYSTEM_TOKEN_EXISTS) {
base::RunLoop loop;
diff --git a/chrome/browser/extensions/api/storage/settings_apitest.cc b/chrome/browser/extensions/api/storage/settings_apitest.cc
index 1bc1773..10b897b 100644
--- a/chrome/browser/extensions/api/storage/settings_apitest.cc
+++ b/chrome/browser/extensions/api/storage/settings_apitest.cc
@@ -118,12 +118,12 @@
}
void InitSync(syncer::SyncChangeProcessor* sync_processor) {
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
InitSyncWithSyncableService(sync_processor, GetSyncableService());
}
void SendChanges(const syncer::SyncChangeList& change_list) {
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
SendChangesToSyncableService(change_list, GetSyncableService());
}
diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
index 44510b83..4199cdf 100644
--- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
+++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
@@ -14,6 +14,7 @@
#include "base/memory/linked_ptr.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/api/storage/settings_sync_util.h"
@@ -225,7 +226,7 @@
// Gets the syncer::SyncableService for the given sync type.
syncer::SyncableService* GetSyncableService(syncer::ModelType model_type) {
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
SyncValueStoreCache* sync_cache = static_cast<SyncValueStoreCache*>(
frontend_->GetValueStoreCache(settings_namespace::SYNC));
return sync_cache->GetSyncableService(model_type);
@@ -1413,7 +1414,7 @@
settings_namespace::LOCAL,
base::Bind(&UnlimitedLocalStorageTestCallback));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
} // namespace extensions
diff --git a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
index 571f4647..69da031 100644
--- a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
+++ b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
@@ -5,7 +5,7 @@
#include <utility>
#include "base/command_line.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "build/build_config.h"
#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/extensions/extension_apitest.h"
@@ -252,7 +252,7 @@
test_server_->GetURL("/doc_path.doc"));
// Wait for the response from the test server.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// There should be no downloads started by the navigation.
DownloadManager* download_manager = GetDownloadManager();
@@ -310,7 +310,7 @@
test_server_->GetURL("/doc_path.doc"));
// Wait for the response from the test server.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// There should be no downloads started by the navigation.
DownloadManager* download_manager = GetDownloadManager();
@@ -425,7 +425,7 @@
test_server_->GetURL("/spreadsheet_path.xls"));
// Wait for the response from the test server.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// There should be no downloads started by the navigation.
DownloadManager* download_manager = GetDownloadManager();
@@ -445,12 +445,12 @@
ResultCatcher catcher;
ui_test_utils::NavigateToURL(browser(),
test_server_->GetURL("/no_abort.rtf"));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(catcher.GetNextResult());
ui_test_utils::NavigateToURL(browser(),
test_server_->GetURL("/abort.rtf"));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(catcher.GetNextResult());
}
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
index 8efcae0..edeb306 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
@@ -19,6 +19,7 @@
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
+#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "base/strings/string_piece.h"
@@ -640,7 +641,7 @@
FireURLRequestWithData(kMethodPost, kMultipart, form_1, form_2);
// We inspect the result in the message list of |ipc_sender_| later.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
&profile_, extension_id, kEventName + "/1", 0, 0);
@@ -673,7 +674,7 @@
// Now send a PUT request with the same body as above.
FireURLRequestWithData(kMethodPut, NULL /*no header*/, plain_1, plain_2);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Clean-up.
ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
@@ -750,7 +751,7 @@
const std::vector<char> part_of_body(1);
FireURLRequestWithData("POST", nullptr, part_of_body, part_of_body);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Clean-up
ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
@@ -813,7 +814,7 @@
}
// We inspect the result in the message list of |ipc_sender_| later.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
&profile_, extension_id, kEventName + "/1", 0, 0);
diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc
index 8f60c3a..54fcbd74 100644
--- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc
+++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc
@@ -5,6 +5,7 @@
#include <stddef.h>
#include "base/json/json_writer.h"
+#include "base/run_loop.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
@@ -55,7 +56,7 @@
for (size_t remaining_tries = 50; remaining_tries > 0; --remaining_tries) {
tab->GetRenderProcessHost()->GetAudioOutputControllers(
base::Bind(OnAudioControllers, &audio_playing));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
if (audio_playing)
break;
diff --git a/chrome/browser/extensions/event_router_forwarder_unittest.cc b/chrome/browser/extensions/event_router_forwarder_unittest.cc
index 11d47c0..aa420b82 100644
--- a/chrome/browser/extensions/event_router_forwarder_unittest.cc
+++ b/chrome/browser/extensions/event_router_forwarder_unittest.cc
@@ -7,9 +7,9 @@
#include <utility>
#include "base/bind.h"
-#include "base/message_loop/message_loop.h"
#include "base/power_monitor/power_monitor.h"
#include "base/power_monitor/power_monitor_device_source.h"
+#include "base/run_loop.h"
#include "base/test/thread_test_helper.h"
#include "build/build_config.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -188,7 +188,7 @@
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get()));
ASSERT_TRUE(helper->Run());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
TEST_F(EventRouterForwarderTest, UnicastRendererUIRestricted) {
diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
index 5e808289..12145f3 100644
--- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
+++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
@@ -4,6 +4,7 @@
#include <stddef.h>
+#include "base/run_loop.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/extension_browsertest.h"
@@ -86,7 +87,7 @@
GetBackgroundHostForExtension(extension_id));
// Wait for extension crash balloon to appear.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
void CheckExtensionConsistency(const std::string& extension_id) {
@@ -485,7 +486,7 @@
ASSERT_EQ(1U, CountBalloons());
UninstallExtension(first_extension_id_);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
SCOPED_TRACE("after uninstalling");
ASSERT_EQ(count_before + 1, GetEnabledExtensionCount());
diff --git a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
index d16dc77..a04d053 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
@@ -18,7 +18,6 @@
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
#include "base/run_loop.h"
#include "base/values.h"
@@ -91,9 +90,7 @@
}
// Runs until UI loop becomes idle.
- void PumpUILoop() {
- base::MessageLoop::current()->RunUntilIdle();
- }
+ void PumpUILoop() { base::RunLoop().RunUntilIdle(); }
// Runs until IO loop becomes idle.
void PumpIOLoop() {
diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
index 238113a..b25b31f 100644
--- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
@@ -5,6 +5,7 @@
#include <stddef.h>
#include "base/macros.h"
+#include "base/run_loop.h"
#include "base/values.h"
#include "build/build_config.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h"
@@ -381,14 +382,14 @@
SCOPED_TRACE(testing::Message() << "i: " << i);
observer.ExpectGrant(apps[i]->id(), change_flags[i]);
policy_->GrantRightsForExtension(apps[i].get(), NULL);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(observer.IsCompleted());
}
for (size_t i = 0; i < arraysize(apps); ++i) {
SCOPED_TRACE(testing::Message() << "i: " << i);
policy_->GrantRightsForExtension(apps[i].get(), NULL);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(observer.IsCompleted());
}
@@ -396,20 +397,20 @@
SCOPED_TRACE(testing::Message() << "i: " << i);
observer.ExpectRevoke(apps[i]->id(), change_flags[i]);
policy_->RevokeRightsForExtension(apps[i].get());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(observer.IsCompleted());
}
for (size_t i = 0; i < arraysize(apps); ++i) {
SCOPED_TRACE(testing::Message() << "i: " << i);
policy_->RevokeRightsForExtension(apps[i].get());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(observer.IsCompleted());
}
observer.ExpectClear();
policy_->RevokeRightsForAllExtensions();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(observer.IsCompleted());
policy_->RemoveObserver(&observer);
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
index 091723d..35a8ebc 100644
--- a/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -9,7 +9,7 @@
#include "base/files/file_util.h"
#include "base/json/json_file_value_serializer.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/threading/thread.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -142,14 +142,14 @@
InitializeEmptyExtensionService();
service_->Init();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
listener_ = new UserScriptListener();
}
void TearDown() override {
listener_ = NULL;
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ExtensionServiceTestBase::TearDown();
}
@@ -206,7 +206,7 @@
TEST_F(UserScriptListenerTest, DelayAndUpdate) {
LoadTestExtension();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
net::TestDelegate delegate;
net::TestURLRequestContext context;
@@ -218,13 +218,13 @@
extensions::NOTIFICATION_USER_SCRIPTS_UPDATED,
content::Source<Profile>(profile_.get()),
content::NotificationService::NoDetails());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(kTestData, delegate.data_received());
}
TEST_F(UserScriptListenerTest, DelayAndUnload) {
LoadTestExtension();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
net::TestDelegate delegate;
net::TestURLRequestContext context;
@@ -233,7 +233,7 @@
ASSERT_FALSE(request->is_pending());
UnloadTestExtension();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// This is still not enough to start delayed requests. We have to notify the
// listener that the user scripts have been updated.
@@ -243,7 +243,7 @@
extensions::NOTIFICATION_USER_SCRIPTS_UPDATED,
content::Source<Profile>(profile_.get()),
content::NotificationService::NoDetails());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(kTestData, delegate.data_received());
}
@@ -256,13 +256,13 @@
// The request should be started immediately.
ASSERT_TRUE(request->is_pending());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(kTestData, delegate.data_received());
}
TEST_F(UserScriptListenerTest, NoDelayNotMatching) {
LoadTestExtension();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
net::TestDelegate delegate;
net::TestURLRequestContext context;
@@ -272,13 +272,13 @@
// The request should be started immediately.
ASSERT_TRUE(request->is_pending());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(kTestData, delegate.data_received());
}
TEST_F(UserScriptListenerTest, MultiProfile) {
LoadTestExtension();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Fire up a second profile and have it load an extension with a content
// script.
@@ -307,7 +307,7 @@
extensions::NOTIFICATION_USER_SCRIPTS_UPDATED,
content::Source<Profile>(profile_.get()),
content::NotificationService::NoDetails());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ASSERT_FALSE(request->is_pending());
EXPECT_TRUE(delegate.data_received().empty());
@@ -316,7 +316,7 @@
extensions::NOTIFICATION_USER_SCRIPTS_UPDATED,
content::Source<Profile>(&profile2),
content::NotificationService::NoDetails());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(kTestData, delegate.data_received());
}
@@ -325,7 +325,7 @@
// throttles.
TEST_F(UserScriptListenerTest, ResumeBeforeStart) {
LoadTestExtension();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
net::TestDelegate delegate;
net::TestURLRequestContext context;
GURL url(kMatchingUrl);
@@ -343,7 +343,7 @@
extensions::NOTIFICATION_USER_SCRIPTS_UPDATED,
content::Source<Profile>(profile_.get()),
content::NotificationService::NoDetails());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
bool defer = false;
throttle->WillStartRequest(&defer);
diff --git a/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm b/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm
index ce2f5087..d96a31a 100644
--- a/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm
+++ b/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm
@@ -5,13 +5,13 @@
#import <Cocoa/Cocoa.h>
#include <stdint.h>
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
#include "base/bind.h"
#include "base/mac/scoped_nsobject.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "chrome/browser/local_discovery/service_discovery_client.h"
#include "chrome/browser/local_discovery/service_discovery_client_mac.h"
+#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "net/base/ip_endpoint.h"
#include "net/base/sockaddr_storage.h"
@@ -146,7 +146,7 @@
resolver_impl->GetContainerForTesting()->OnResolveUpdate(
ServiceResolver::STATUS_SUCCESS);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1, num_resolves_);
EXPECT_EQ(2u, last_service_description_.metadata.size());
diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
index d16652c..a69d0e4 100644
--- a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
+++ b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
@@ -15,6 +15,7 @@
#include "base/format_macros.h"
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
@@ -220,7 +221,7 @@
operation_runner()->FileExists(
url, base::Bind(&ExpectEqHelper, test_name, expectation));
}
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
}
@@ -234,7 +235,7 @@
bool completed = false;
operation_runner()->ReadDirectory(
url, base::Bind(&DidReadDirectory, &content, &completed));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(completed);
EXPECT_EQ(6u, content.size());
@@ -267,7 +268,7 @@
url, false, false,
base::Bind(&ExpectEqHelper, test_name, expectation));
}
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
}
}
@@ -307,7 +308,7 @@
storage::FileSystemOperation::ERROR_BEHAVIOR_ABORT,
storage::FileSystemOperationRunner::CopyProgressCallback(),
base::Bind(&ExpectEqHelper, test_name, expectation));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
}
}
@@ -372,7 +373,7 @@
storage::FileSystemOperation::ERROR_BEHAVIOR_ABORT,
storage::FileSystemOperationRunner::CopyProgressCallback(),
base::Bind(&ExpectEqHelper, test_name, expectation));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
}
}
@@ -412,7 +413,7 @@
dest_url,
storage::FileSystemOperation::OPTION_NONE,
base::Bind(&ExpectEqHelper, test_name, expectation));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
}
}
@@ -479,7 +480,7 @@
url,
storage::FileSystemOperation::OPTION_NONE,
base::Bind(&ExpectEqHelper, test_name, expectation));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
}
}
@@ -507,7 +508,7 @@
url, storage::FileSystemOperation::GET_METADATA_FIELD_IS_DIRECTORY,
base::Bind(&ExpectMetadataEqHelper, test_name, expectation,
kFilteringTestCases[i].is_directory));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
}
}
@@ -535,7 +536,7 @@
}
operation_runner()->RemoveFile(
url, base::Bind(&ExpectEqHelper, test_name, expectation));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
}
}
@@ -568,7 +569,7 @@
error = base::File::FILE_ERROR_FAILED;
operation_runner()->CreateSnapshotFile(url,
base::Bind(CreateSnapshotCallback, &error));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ASSERT_EQ(expected_error, error);
}
}
diff --git a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
index 5198bd9..0227add 100644
--- a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
+++ b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
@@ -19,7 +19,6 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h"
-#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
@@ -471,7 +470,7 @@
shared_web_contents2_.reset();
profile_.reset();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
MediaGalleriesPreferences* ProfileState::GetMediaGalleriesPrefs() {
@@ -499,7 +498,7 @@
base::StringPrintf("%s (no permission)", test.c_str()),
base::ConstRef(empty_names),
base::ConstRef(empty_expectation)));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1, GetAndClearComparisonCount());
// Read permission only.
@@ -509,7 +508,7 @@
base::StringPrintf("%s (regular permission)", test.c_str()),
base::ConstRef(compare_names_read_),
base::ConstRef(regular_extension_galleries)));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1, GetAndClearComparisonCount());
// All galleries permission.
@@ -519,7 +518,7 @@
base::StringPrintf("%s (all permission)", test.c_str()),
base::ConstRef(compare_names_all_),
base::ConstRef(all_extension_galleries)));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1, GetAndClearComparisonCount());
}
@@ -530,7 +529,7 @@
registry->GetMediaFileSystemsForExtension(
single_web_contents_.get(), extension,
base::Bind(&GetGalleryInfoCallback, base::Unretained(&results)));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
return results;
}
@@ -647,14 +646,14 @@
DCHECK(StorageInfo::IsRemovableDevice(device_id));
base::string16 label = location.BaseName().LossyDisplayName();
ProcessAttach(device_id, label, location.value());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
return device_id;
}
void MediaFileSystemRegistryTest::DetachDevice(const std::string& device_id) {
DCHECK(StorageInfo::IsRemovableDevice(device_id));
ProcessDetach(device_id);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
void MediaFileSystemRegistryTest::SetGalleryPermission(
@@ -896,7 +895,7 @@
break;
}
}
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(forget_gallery);
EXPECT_EQ(gallery_count, GetAutoAddedGalleries(profile_state).size());
diff --git a/chrome/browser/net/chrome_network_delegate_unittest.cc b/chrome/browser/net/chrome_network_delegate_unittest.cc
index f8603c90..27f3f9a 100644
--- a/chrome/browser/net/chrome_network_delegate_unittest.cc
+++ b/chrome/browser/net/chrome_network_delegate_unittest.cc
@@ -12,7 +12,6 @@
#include "base/command_line.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/test/histogram_tester.h"
#include "build/build_config.h"
@@ -404,7 +403,7 @@
GURL("http://anyurl.com"), net::DEFAULT_PRIORITY, &delegate_));
request->Start();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(expect_google_safe_search ? 1 : 0,
safe_search_util::GetForceGoogleSafeSearchCountForTesting());
diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc
index 6b4256e1..3f566d3 100644
--- a/chrome/browser/password_manager/password_store_x_unittest.cc
+++ b/chrome/browser/password_manager/password_store_x_unittest.cc
@@ -343,7 +343,7 @@
}
void PasswordStoreXTestDelegate::FinishAsyncProcessing() {
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
void PasswordStoreXTestDelegate::SetupTempDir() {
diff --git a/chrome/browser/printing/print_job_unittest.cc b/chrome/browser/printing/print_job_unittest.cc
index b514682..eea96cb 100644
--- a/chrome/browser/printing/print_job_unittest.cc
+++ b/chrome/browser/printing/print_job_unittest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/printing/print_job.h"
#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/strings/string16.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/printing/print_job_worker.h"
@@ -95,12 +96,12 @@
job->Initialize(owner.get(), &source, 1);
job->Stop();
while (job->document()) {
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
EXPECT_FALSE(job->document());
job = NULL;
while (!check) {
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
EXPECT_TRUE(check);
}
diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
index 96a2c09..267a9ad 100644
--- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc
+++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
@@ -11,6 +11,7 @@
#include "base/macros.h"
#include "base/memory/ptr_util.h"
+#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_path_override.h"
#include "build/build_config.h"
@@ -260,7 +261,7 @@
std::unique_ptr<BrandcodeConfigFetcher> fetcher(new BrandcodeConfigFetcher(
base::Bind(&ConfigParserTest::Callback, base::Unretained(this)), url,
"ABCD"));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(fetcher->IsActive());
// Look for the brand code in the request.
EXPECT_NE(std::string::npos, request_listener_.upload_data.find("ABCD"));
@@ -566,7 +567,7 @@
false);
service_->FinishInstallationForTest(theme.get());
// Let ThemeService finish creating the theme pack.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ThemeService* theme_service =
ThemeServiceFactory::GetForProfile(profile());
@@ -662,7 +663,7 @@
false);
service_->FinishInstallationForTest(ext1.get());
// Let ThemeService finish creating the theme pack.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ThemeService* theme_service =
ThemeServiceFactory::GetForProfile(profile());
@@ -861,7 +862,7 @@
ResettableSettingsSnapshot nonorganic_snap(profile());
nonorganic_snap.RequestShortcuts(base::Closure());
// Let it enumerate shortcuts on the FILE thread.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
int diff_fields = ResettableSettingsSnapshot::ALL_FIELDS;
if (!ShortcutHandler::IsSupported())
diff_fields &= ~ResettableSettingsSnapshot::SHORTCUTS;
@@ -889,7 +890,7 @@
ResettableSettingsSnapshot organic_snap(profile());
organic_snap.RequestShortcuts(base::Closure());
// Let it enumerate shortcuts on the FILE thread.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(diff_fields, nonorganic_snap.FindDifferentFields(organic_snap));
nonorganic_snap.Subtract(organic_snap);
const GURL urls[] = {GURL("http://foo.de"), GURL("http://goo.gl")};
@@ -935,7 +936,7 @@
ResettableSettingsSnapshot nonorganic_snap(profile());
nonorganic_snap.RequestShortcuts(base::Closure());
// Let it enumerate shortcuts on the FILE thread.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
static_assert(ResettableSettingsSnapshot::ALL_FIELDS == 31,
"this test needs to be expanded");
@@ -1016,7 +1017,7 @@
profile(),
base::ConstRef(snapshot)));
// Let it enumerate shortcuts on the FILE thread.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
::testing::Mock::VerifyAndClearExpectations(&capture);
// The homepage and the startup page are in punycode. They are unreadable.
// Trying to find the extension name.
@@ -1055,7 +1056,7 @@
deleted_snapshot.reset();
// Running remaining tasks shouldn't trigger the callback to be called as
// |deleted_snapshot| was deleted before it could run.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
} // namespace
diff --git a/chrome/browser/profiles/profile_destroyer_unittest.cc b/chrome/browser/profiles/profile_destroyer_unittest.cc
index c542a2c4..e4233fc 100644
--- a/chrome/browser/profiles/profile_destroyer_unittest.cc
+++ b/chrome/browser/profiles/profile_destroyer_unittest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/profiles/profile_destroyer.h"
#include "base/macros.h"
+#include "base/run_loop.h"
#include "chrome/test/base/browser_with_test_window_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/browser/render_process_host.h"
@@ -95,12 +96,12 @@
render_process_host1.release()->Cleanup();
// And asynchronicity kicked in properly.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(off_the_record_profile_->destroyed_otr_profile_);
// I meant, ALL the render process hosts... :-)
render_process_host2.release()->Cleanup();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(off_the_record_profile_->destroyed_otr_profile_);
}
@@ -127,7 +128,7 @@
EXPECT_FALSE(original_profile->destroyed_otr_profile_);
render_process_host1.release()->Cleanup();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(NULL, TestingOriginalDestructionProfile::living_instance_);
// And the same protection should apply to the main profile.
@@ -142,6 +143,6 @@
ProfileDestroyer::DestroyProfileWhenAppropriate(main_profile);
EXPECT_EQ(main_profile, TestingOriginalDestructionProfile::living_instance_);
render_process_host2.release()->Cleanup();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(NULL, TestingOriginalDestructionProfile::living_instance_);
}
diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm
index 5b45c06..2e445ec9 100644
--- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm
+++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm
@@ -9,7 +9,7 @@
#include "base/mac/scoped_nsobject.h"
#import "base/mac/sdk_forward_declarations.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/test/base/in_process_browser_test.h"
@@ -348,7 +348,7 @@
[[NSRunLoop currentRunLoop]
runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.001]];
// The renderer process returns an IPC, which needs to be handled.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
}
diff --git a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc
index b150068..af0ed6a 100644
--- a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc
@@ -13,7 +13,7 @@
#include "base/callback.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/common/safe_browsing/csd.pb.h"
#include "chrome/test/base/testing_profile.h"
@@ -163,7 +163,7 @@
}
// Runs all tasks posted to the test thread's message loop.
- void RunAllTasks() { base::MessageLoop::current()->RunUntilIdle(); }
+ void RunAllTasks() { base::RunLoop().RunUntilIdle(); }
// Adds a DownloadManager for the test profile. The DownloadMetadataManager's
// observer is stashed for later use. Only call once per call to
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
index 54b9549..846f360 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
@@ -15,6 +15,7 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/sha1.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
@@ -1219,7 +1220,7 @@
// Flush through the corruption-handler task.
DVLOG(1) << "Expect failed check on: SafeBrowsing database reset";
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
// Database file should not exist.
diff --git a/chrome/browser/safe_browsing/srt_fetcher_browsertest_win.cc b/chrome/browser/safe_browsing/srt_fetcher_browsertest_win.cc
index 72a457b..0a763c3 100644
--- a/chrome/browser/safe_browsing/srt_fetcher_browsertest_win.cc
+++ b/chrome/browser/safe_browsing/srt_fetcher_browsertest_win.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/test/test_simple_task_runner.h"
#include "base/time/time.h"
#include "chrome/browser/browser_process.h"
@@ -81,7 +81,7 @@
RunReporter();
task_runner_->RunPendingTasks();
EXPECT_TRUE(reporter_launched_);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(prompt_trigger_called_);
ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
}
@@ -95,7 +95,7 @@
// The reply task from the task posted to run the reporter is run on a
// specific thread, as opposed to a specific task runner, and that thread is
// the current message loop's thread.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(prompt_trigger_called_);
ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
}
@@ -136,7 +136,7 @@
task_runner_->RunPendingTasks();
EXPECT_TRUE(reporter_launched_);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(prompt_trigger_called_);
ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
}
@@ -153,13 +153,13 @@
task_runner_->RunPendingTasks();
EXPECT_TRUE(reporter_launched_);
reporter_launched_ = false;
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ExpectToRunAgain(kDaysBetweenSwReporterRunsForPendingPrompt);
local_state->SetBoolean(prefs::kSwReporterPendingPrompt, false);
task_runner_->RunPendingTasks();
EXPECT_FALSE(reporter_launched_);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
}
diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc
index bff640f..d4b20fa 100644
--- a/chrome/browser/search/hotword_service_unittest.cc
+++ b/chrome/browser/search/hotword_service_unittest.cc
@@ -10,6 +10,7 @@
#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/field_trial.h"
+#include "base/run_loop.h"
#include "base/test/test_simple_task_runner.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
@@ -256,7 +257,7 @@
SetApplicationLocale(profile(), "test_locale");
hotword_service->InstallHotwordExtensionFromWebstore(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ("test_locale",
profile()->GetPrefs()->GetString(prefs::kHotwordPreviousLanguage));
@@ -284,7 +285,7 @@
// Do an initial installation.
hotword_service->InstallHotwordExtensionFromWebstore(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ("en",
profile()->GetPrefs()->GetString(prefs::kHotwordPreviousLanguage));
@@ -379,7 +380,7 @@
// Do an initial installation.
hotword_service->InstallHotwordExtensionFromWebstore(1);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// The previous locale should be set but should match the current
// locale. No reason to uninstall.
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
index 62e952a..8ed2ebe 100644
--- a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
+++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
@@ -15,6 +15,7 @@
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_samples.h"
#include "base/metrics/statistics_recorder.h"
+#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "build/build_config.h"
#include "chrome/browser/spellchecker/spellcheck_factory.h"
@@ -525,7 +526,7 @@
EXPECT_EQ(expected_words_in_memory, custom_dictionary->GetWords());
// Finish all writes to disk.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
std::string actual_contents_on_disk;
base::ReadFileToString(path, &actual_contents_on_disk);
diff --git a/chrome/browser/ssl/ssl_error_handler_unittest.cc b/chrome/browser/ssl/ssl_error_handler_unittest.cc
index e09d521..8cf97fa 100644
--- a/chrome/browser/ssl/ssl_error_handler_unittest.cc
+++ b/chrome/browser/ssl/ssl_error_handler_unittest.cc
@@ -6,7 +6,6 @@
#include "base/callback.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
#include "base/metrics/field_trial.h"
#include "base/run_loop.h"
#include "base/time/time.h"
@@ -176,7 +175,7 @@
EXPECT_FALSE(error_handler()->captive_portal_interstitial_shown());
error_handler()->ClearSeenOperations();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(error_handler()->IsTimerRunning());
EXPECT_FALSE(error_handler()->captive_portal_checked());
@@ -197,7 +196,7 @@
error_handler()->ClearSeenOperations();
error_handler()->SendCaptivePortalNotification(
captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(error_handler()->IsTimerRunning());
EXPECT_FALSE(error_handler()->captive_portal_checked());
@@ -220,7 +219,7 @@
error_handler()->ClearSeenOperations();
error_handler()->SendCaptivePortalNotification(
captive_portal::RESULT_INTERNET_CONNECTED);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(error_handler()->IsTimerRunning());
EXPECT_FALSE(error_handler()->captive_portal_checked());
diff --git a/chrome/browser/sync/test/integration/wifi_credentials_helper_chromeos.cc b/chrome/browser/sync/test/integration/wifi_credentials_helper_chromeos.cc
index 80452ec..5d5327a2 100644
--- a/chrome/browser/sync/test/integration/wifi_credentials_helper_chromeos.cc
+++ b/chrome/browser/sync/test/integration/wifi_credentials_helper_chromeos.cc
@@ -10,7 +10,7 @@
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/logging.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "chromeos/dbus/dbus_thread_manager.h"
@@ -112,7 +112,7 @@
base::Bind(LogCreateConfigurationFailure,
base::StringPrintf("Failed to add credential %s",
credential.ToString().c_str())));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
WifiCredentialSet GetWifiCredentialsForProfileChromeOs(
diff --git a/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc b/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc
index fd9dff5..a49bead 100644
--- a/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc
+++ b/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/threading/thread_task_runner_handle.h"
#include "google_apis/drive/drive_api_parser.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -121,7 +121,7 @@
title,
false, // shared_with_me
base::Bind(&DidAddFileForUploadNew, callback));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
return CancelCallback();
}
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
index 3849c0c..13a28d6 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
@@ -70,7 +70,7 @@
base::ThreadTaskRunnerHandle::Get(),
nullptr /* worker_pool */));
task_manager_->Initialize(SYNC_STATUS_OK);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
maybe_schedule_next_task_count_ = 0;
}
~TaskManagerClient() override {}
diff --git a/chrome/browser/themes/theme_service_unittest.cc b/chrome/browser/themes/theme_service_unittest.cc
index 339cc0f..f9e60b5 100644
--- a/chrome/browser/themes/theme_service_unittest.cc
+++ b/chrome/browser/themes/theme_service_unittest.cc
@@ -8,6 +8,7 @@
#include "base/files/file_util.h"
#include "base/macros.h"
#include "base/path_service.h"
+#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "build/build_config.h"
#include "chrome/browser/chrome_notification_types.h"
@@ -78,7 +79,7 @@
std::string extension_id = observer.WaitForExtensionLoaded()->id();
// Let the ThemeService finish creating the theme pack.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
return extension_id;
}
@@ -104,7 +105,7 @@
}
// Let the ThemeService finish creating the theme pack.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
const CustomThemeSupplier* get_theme_supplier(ThemeService* theme_service) {
@@ -140,7 +141,7 @@
ThemeServiceFactory::GetForProfile(profile_.get());
theme_service->UseDefaultTheme();
// Let the ThemeService uninstall unused themes.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -164,7 +165,7 @@
ThemeServiceFactory::GetForProfile(profile_.get());
theme_service->UseDefaultTheme();
// Let the ThemeService uninstall unused themes.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
base::ScopedTempDir temp_dir1;
ASSERT_TRUE(temp_dir1.CreateUniqueTempDir());
@@ -188,7 +189,7 @@
// 2) Enabling a disabled theme extension should swap the current theme.
service_->EnableExtension(extension1_id);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(extension1_id, theme_service->GetThemeID());
EXPECT_TRUE(service_->IsExtensionEnabled(extension1_id));
EXPECT_TRUE(registry_->GetExtensionById(extension2_id,
@@ -200,7 +201,7 @@
const extensions::Extension* extension2 =
service_->GetInstalledExtension(extension2_id);
theme_service->SetTheme(extension2);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(extension2_id, theme_service->GetThemeID());
EXPECT_TRUE(service_->IsExtensionEnabled(extension2_id));
EXPECT_TRUE(registry_->GetExtensionById(extension1_id,
@@ -212,7 +213,7 @@
EXPECT_FALSE(theme_service->UsingDefaultTheme());
service_->DisableExtension(extension2_id,
extensions::Extension::DISABLE_USER_ACTION);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(theme_service->UsingDefaultTheme());
EXPECT_FALSE(service_->GetInstalledExtension(extension1_id));
EXPECT_FALSE(service_->GetInstalledExtension(extension2_id));
@@ -225,7 +226,7 @@
ThemeServiceFactory::GetForProfile(profile_.get());
theme_service->UseDefaultTheme();
// Let the ThemeService uninstall unused themes.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
theme_service->OnInfobarDisplayed();
@@ -268,7 +269,7 @@
ThemeServiceFactory::GetForProfile(profile_.get());
theme_service->UseDefaultTheme();
// Let the ThemeService uninstall unused themes.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Should get the same ThemeService for incognito and original profiles.
ThemeService* otr_theme_service =
@@ -329,7 +330,7 @@
ThemeServiceFactory::GetForProfile(profile_.get());
theme_service->UseDefaultTheme();
// Let the ThemeService uninstall unused themes.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
base::ScopedTempDir temp_dir1;
ASSERT_TRUE(temp_dir1.CreateUniqueTempDir());
diff --git a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
index aff1aace..db00e35 100644
--- a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
+++ b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
@@ -13,6 +13,7 @@
#include "base/command_line.h"
#include "base/macros.h"
+#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "build/build_config.h"
#include "chrome/app/chrome_command_ids.h"
@@ -342,7 +343,7 @@
// The TranslateManager class processes the navigation entry committed
// notification in a posted task; process that task.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
TestRenderViewContextMenu* CreateContextMenu() {
@@ -940,7 +941,7 @@
// The TranslateManager class processes the navigation entry committed
// notification in a posted task; process that task.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(CloseTranslateUi());
}
@@ -1630,7 +1631,7 @@
SimulateOnPageTranslated("fr", "en");
// A task should have been posted to clear the script, run it.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Do another navigation and translation.
SimulateNavigation(GURL("http://www.google.es"), "es", true);
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index 8046a11..abd23f7c 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -21,6 +21,7 @@
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/macros.h"
+#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
@@ -139,7 +140,7 @@
generator->MoveMouseTo(all_apps_rect.CenterPoint().x(),
all_apps_rect.CenterPoint().y());
generator->ClickLeftButton();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Run Layout() to effectively complete the animation to the apps page.
service_test.LayoutContentsView();
}
@@ -344,15 +345,15 @@
gfx::Point start_point = button->GetBoundsInScreen().CenterPoint();
gfx::Point rip_off_point(start_point.x(), 0);
generator->MoveMouseTo(start_point.x(), start_point.y());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
generator->PressLeftButton();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
generator->MoveMouseTo(rip_off_point.x(), rip_off_point.y());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
test->RunMessageLoopUntilAnimationsDone();
if (command == RIP_OFF_ITEM_AND_RETURN) {
generator->MoveMouseTo(start_point.x(), start_point.y());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
test->RunMessageLoopUntilAnimationsDone();
} else if (command == RIP_OFF_ITEM_AND_CANCEL) {
// This triggers an internal cancel. Using VKEY_ESCAPE was too unreliable.
@@ -360,7 +361,7 @@
}
if (command != RIP_OFF_ITEM_AND_DONT_RELEASE_MOUSE) {
generator->ReleaseLeftButton();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
test->RunMessageLoopUntilAnimationsDone();
}
}
@@ -1654,7 +1655,7 @@
test.shelf_view()->GetAppListButtonView()->GetBoundsInScreen();
generator.MoveMouseTo(app_list_bounds.CenterPoint().x(),
app_list_bounds.CenterPoint().y());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
generator.ClickLeftButton();
EXPECT_TRUE(service->IsAppListVisible());
@@ -1677,7 +1678,7 @@
gfx::Rect bounds_grid_1 = item1->GetBoundsInScreen();
generator.MoveMouseTo(bounds_grid_1.CenterPoint().x(),
bounds_grid_1.CenterPoint().y());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
generator.PressLeftButton();
EXPECT_FALSE(grid_view->forward_events_to_drag_and_drop_host_for_test());
@@ -1688,7 +1689,7 @@
gfx::Rect bounds_shelf_1 = shelf1->GetBoundsInScreen();
generator.MoveMouseTo(bounds_shelf_1.CenterPoint().x(),
bounds_shelf_1.CenterPoint().y());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Check that a new item got created.
EXPECT_EQ(3, model_->item_count());
@@ -1697,13 +1698,13 @@
// Move it where the item originally was and check that it disappears again.
generator.MoveMouseTo(bounds_grid_1.CenterPoint().x(),
bounds_grid_1.CenterPoint().y());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(2, model_->item_count());
EXPECT_FALSE(grid_view->forward_events_to_drag_and_drop_host_for_test());
// Dropping it should keep the launcher as it originally was.
generator.ReleaseLeftButton();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(2, model_->item_count());
// There are a few animations which need finishing before we can continue.
test.RunMessageLoopUntilAnimationsDone();
@@ -1717,11 +1718,11 @@
generator.PressLeftButton();
generator.MoveMouseTo(bounds_shelf_1.CenterPoint().x(),
bounds_shelf_1.CenterPoint().y());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(3, model_->item_count());
EXPECT_TRUE(grid_view->forward_events_to_drag_and_drop_host_for_test());
generator.ReleaseLeftButton();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(grid_view->forward_events_to_drag_and_drop_host_for_test());
EXPECT_EQ(3, model_->item_count()); // It should be still there.
test.RunMessageLoopUntilAnimationsDone();
@@ -1733,11 +1734,11 @@
generator.PressLeftButton();
generator.MoveMouseTo(bounds_shelf_1.CenterPoint().x(),
bounds_shelf_1.CenterPoint().y());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(3, model_->item_count()); // No new item got added.
EXPECT_TRUE(grid_view->forward_events_to_drag_and_drop_host_for_test());
generator.ReleaseLeftButton();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(grid_view->forward_events_to_drag_and_drop_host_for_test());
EXPECT_EQ(3, model_->item_count()); // And it remains that way.
@@ -1747,7 +1748,7 @@
generator.PressLeftButton();
generator.MoveMouseTo(bounds_shelf_1.CenterPoint().x(),
bounds_shelf_1.CenterPoint().y());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Issue an ESC and see that the operation gets cancelled.
generator.PressKey(ui::VKEY_ESCAPE, 0);
generator.ReleaseKey(ui::VKEY_ESCAPE, 0);
@@ -1805,7 +1806,7 @@
generator.MoveMouseTo(app_list_bounds.CenterPoint().x(),
app_list_bounds.CenterPoint().y());
generator.ClickLeftButton();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(service->IsAppListVisible());
// Click the "all apps" button on the start page.
@@ -1832,7 +1833,7 @@
bounds_grid_1.Offset(-origin.x(), -origin.y());
generator.MoveMouseTo(bounds_grid_1.CenterPoint().x(),
bounds_grid_1.CenterPoint().y());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
generator.PressLeftButton();
EXPECT_FALSE(grid_view->forward_events_to_drag_and_drop_host_for_test());
@@ -1844,7 +1845,7 @@
bounds_shelf_1.Offset(-origin.x(), -origin.y());
generator.MoveMouseTo(bounds_shelf_1.CenterPoint().x(),
bounds_shelf_1.CenterPoint().y());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Check that a new item got created.
EXPECT_EQ(3, model_->item_count());
@@ -1855,13 +1856,13 @@
empty_slot_rect.Offset(0, grid_view->GetTotalTileSize().height());
generator.MoveMouseTo(empty_slot_rect.CenterPoint().x(),
empty_slot_rect.CenterPoint().y());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(2, model_->item_count());
EXPECT_FALSE(grid_view->forward_events_to_drag_and_drop_host_for_test());
// Dropping it should keep the shelf as it originally was.
generator.ReleaseLeftButton();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(2, model_->item_count());
}
@@ -1928,7 +1929,7 @@
test.RunMessageLoopUntilAnimationsDone();
EXPECT_EQ(2, model_->item_count()); // The item should now be gone.
generator.ReleaseLeftButton();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(2, model_->item_count()); // And it remains that way.
EXPECT_EQ(-1, GetIndexOfShelfItemType(ash::TYPE_APP_SHORTCUT));
@@ -1986,7 +1987,7 @@
generator.MoveMouseTo(app_list_bounds.CenterPoint().x(),
app_list_bounds.CenterPoint().y());
generator.ClickLeftButton();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(service->IsAppListVisible());
// Click the "all apps" button on the start page.
@@ -2007,7 +2008,7 @@
generator.MoveMouseTo(bounds_grid_1.CenterPoint().x(),
bounds_grid_1.CenterPoint().y());
generator.ClickLeftButton();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(tab_count + 1, tab_strip->count());
}
@@ -2138,12 +2139,12 @@
ui_test_utils::NavigateToURL(app_browser,
GURL("http://www.foo.com/bar.html"));
// Make sure the navigation was entirely performed.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(ash::STATUS_ACTIVE, model_->ItemByID(id)->status);
app_browser->tab_strip_model()->CloseWebContentsAt(0,
TabStripModel::CLOSE_NONE);
// Make sure that the app is really gone.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(ash::STATUS_CLOSED, model_->ItemByID(id)->status);
}
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
index f6b64385..feb115b 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -25,6 +25,7 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/macros.h"
+#include "base/run_loop.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
@@ -146,7 +147,7 @@
while (multi_user_window_manager_->IsAnimationRunningForTest()) {
// This should never take longer then a second.
ASSERT_GE(1000, (base::TimeTicks::Now() - now).InMilliseconds());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
}
diff --git a/chrome/browser/ui/browser_command_controller_browsertest.cc b/chrome/browser/ui/browser_command_controller_browsertest.cc
index 1869cfd5..32b950ac 100644
--- a/chrome/browser/ui/browser_command_controller_browsertest.cc
+++ b/chrome/browser/ui/browser_command_controller_browsertest.cc
@@ -6,6 +6,7 @@
#include "base/command_line.h"
#include "base/macros.h"
+#include "base/run_loop.h"
#include "build/build_config.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/browser_process.h"
@@ -92,7 +93,7 @@
// RunUntilIdle() (racily) isn't sufficient to ensure browser creation, so
// listen for the notification.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
browser_creation_observer.Wait();
EXPECT_EQ(2U, BrowserList::GetInstance()->size());
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index fe613eba..c7eb71c 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -7,6 +7,7 @@
#include "base/command_line.h"
#include "base/files/file_util.h"
#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -956,7 +957,7 @@
chrome::ShowFindBar(browser());
// This is needed on GTK because the reposition operation is asynchronous.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
gfx::Point start_position;
gfx::Point position;
@@ -1392,12 +1393,12 @@
popup->window()->Show();
// On GTK, bounds change is asynchronous.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EnsureFindBoxOpenForBrowser(popup);
// GTK adjusts FindBar size asynchronously.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ASSERT_LE(GetFindBarWidthForBrowser(popup),
popup->window()->GetBounds().width());
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 32127b3..954a9e5c 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -5,6 +5,7 @@
#include <stddef.h>
#include "base/bind.h"
+#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "chrome/app/chrome_command_ids.h"
@@ -281,7 +282,7 @@
// Ensure that the layout message can get a chance to be processed so that
// the button visibility can be updated.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(3, panel_manager->num_panels());
EXPECT_TRUE(docked_collection->HasPanel(panel1));
@@ -1357,12 +1358,12 @@
WaitForPanelActiveState(panel1, SHOW_AS_ACTIVE);
panel1->SetExpansionState(Panel::MINIMIZED);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
WaitForPanelActiveState(panel1, SHOW_AS_INACTIVE);
EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
panel2->SetExpansionState(Panel::MINIMIZED);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
WaitForPanelActiveState(panel2, SHOW_AS_INACTIVE);
EXPECT_EQ(Panel::MINIMIZED, panel2->expansion_state());
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index 5a5e29c3..c66edb1 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -857,7 +857,7 @@
while (SessionRestore::IsRestoring(profile1) ||
SessionRestore::IsRestoring(profile2))
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// The startup URLs are ignored, and instead the last open sessions are
// restored.
@@ -953,7 +953,7 @@
SessionRestore::IsRestoring(profile_home2) ||
SessionRestore::IsRestoring(profile_last) ||
SessionRestore::IsRestoring(profile_urls))
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
Browser* new_browser = NULL;
// The last open profile (the profile_home1 in this case) will always be
diff --git a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc
index fd0c25d0..5279bce 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc
@@ -6,7 +6,7 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/prefs/session_startup_pref.h"
@@ -71,7 +71,7 @@
last_opened_profiles);
while (!browser_creator.ActivatedProfile())
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
Browser* new_browser = NULL;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index 40c1ae6..27a2aa6a 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -1094,7 +1094,7 @@
ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
ui_controls::DOWN | ui_controls::UP,
CreateEventTask(this, &BookmarkBarViewTest10::Step2));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
private:
@@ -2283,7 +2283,7 @@
ui_test_utils::MoveMouseToCenterAndPress(
button, ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
CreateEventTask(this, &BookmarkBarViewTest25::Step2));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
private:
@@ -2326,7 +2326,7 @@
ui_test_utils::MoveMouseToCenterAndPress(
button, ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
CreateEventTask(this, &BookmarkBarViewTest26::Step2));
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
private:
diff --git a/chrome/browser/ui/views/location_bar/star_view_browsertest.cc b/chrome/browser/ui/views/location_bar/star_view_browsertest.cc
index 1e799533..5b87d09c 100644
--- a/chrome/browser/ui/views/location_bar/star_view_browsertest.cc
+++ b/chrome/browser/ui/views/location_bar/star_view_browsertest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/views/location_bar/star_view.h"
#include "base/command_line.h"
+#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -62,7 +63,7 @@
// Hide the bubble manually. In the browser this would normally happen during
// the event processing.
BookmarkBubbleView::Hide();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(BookmarkBubbleView::bookmark_bubble());
star_view->OnMouseReleased(released_event);
EXPECT_FALSE(BookmarkBubbleView::bookmark_bubble());
diff --git a/chrome/browser/ui/views/panels/panel_view.cc b/chrome/browser/ui/views/panels/panel_view.cc
index a494437..1d567b6 100644
--- a/chrome/browser/ui/views/panels/panel_view.cc
+++ b/chrome/browser/ui/views/panels/panel_view.cc
@@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "chrome/app/chrome_command_ids.h"
@@ -159,7 +159,7 @@
}
bool NativePanelTestingViews::VerifyDrawingAttention() const {
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
return panel_view_->GetFrameView()->GetPaintState() ==
PanelFrameView::PAINT_FOR_ATTENTION;
}
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
index c5f1fb52..d16c17c 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
@@ -10,6 +10,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/path_service.h"
+#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/histogram_tester.h"
#include "chrome/browser/browser_process.h"
@@ -139,7 +140,7 @@
ui::MouseEvent e(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(),
ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
button->OnMouseReleased(e);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(ProfileChooserView::IsShowing());
// Create this observer before lock is pressed to avoid a race condition.
@@ -192,7 +193,7 @@
current_profile_bubble()->ShowView(
profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN,
current_profile_bubble()->avatar_menu_.get());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
private:
diff --git a/chrome/browser/ui/views/toolbar/reload_button_unittest.cc b/chrome/browser/ui/views/toolbar/reload_button_unittest.cc
index 00abdb0..fe70511 100644
--- a/chrome/browser/ui/views/toolbar/reload_button_unittest.cc
+++ b/chrome/browser/ui/views/toolbar/reload_button_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "chrome/browser/ui/views/toolbar/reload_button.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "chrome/test/base/testing_profile.h"
@@ -97,7 +97,7 @@
false);
// Now fire the timer. This should complete the mode change.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
CheckState(true, ReloadButton::MODE_STOP, ReloadButton::MODE_STOP, false,
false);
}
@@ -150,7 +150,7 @@
reload_.ChangeMode(ReloadButton::MODE_RELOAD, false);
// Now fire the stop-to-reload timer. This should reset the button.
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
CheckState(true, ReloadButton::MODE_RELOAD, ReloadButton::MODE_RELOAD, false,
false);
}
diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc b/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
index 9629d0a..e2bf89d 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
+++ b/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/command_line.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/histogram_tester.h"
#include "chrome/browser/permissions/permission_uma_util.h"
@@ -64,12 +64,12 @@
void WaitForFrameLoad() {
// PermissionBubbleManager ignores all parameters. Yay?
manager_->DocumentLoadedInFrame(NULL);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
void WaitForCoalescing() {
manager_->DocumentOnLoadCompletedInMainFrame();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
void MockTabSwitchAway() { manager_->HideBubble(); }
@@ -449,7 +449,7 @@
manager_->AddRequest(&request1_);
manager_->AddRequest(&iframe_request_other_domain_);
manager_->AddRequest(&request2_);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(view_factory_->is_visible());
}
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc b/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc
index 3b52ba4..d4aeb58 100644
--- a/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc
+++ b/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc
@@ -9,6 +9,7 @@
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
+#include "base/run_loop.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -68,7 +69,7 @@
"eth",
shill::kTypeEthernet, shill::kStateOnline,
true /* visible */);
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
void TearDown() override {
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
index 6e6a84fd..c59fb48c 100644
--- a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
@@ -4,6 +4,7 @@
#include "base/command_line.h"
#include "base/macros.h"
+#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h"
@@ -595,7 +596,7 @@
OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN));
SimulateOnClientOAuthSuccess(helper, "refresh_token");
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
// Test signin helper creates sync starter with correct confirmation when
@@ -629,7 +630,7 @@
OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN));
SimulateOnClientOAuthSuccess(helper, "refresh_token");
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
// Test signin helper creates sync starter with correct confirmation when
@@ -664,7 +665,7 @@
OneClickSigninSyncStarter::CONFIRM_UNTRUSTED_SIGNIN));
SimulateOnClientOAuthSuccess(helper, "refresh_token");
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
// Test signin helper creates sync starter with correct confirmation during
@@ -701,7 +702,7 @@
OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN));
SimulateOnClientOAuthSuccess(helper, "refresh_token");
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
// Test signin helper does not create sync starter when reauthenticating.
@@ -727,7 +728,7 @@
false); // confirm untrusted signin
SimulateOnClientOAuthSuccess(&helper, "refresh_token");
ASSERT_EQ(1ul, token_service()->GetAccounts().size());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
// Test signin helper does not create sync starter when adding another account
@@ -754,7 +755,7 @@
false); // confirm untrusted signin
SimulateOnClientOAuthSuccess(&helper, "refresh_token");
ASSERT_EQ(1ul, token_service()->GetAccounts().size());
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
class InlineLoginUISafeIframeBrowserTest : public InProcessBrowserTest {
@@ -885,6 +886,6 @@
ExecuteJsToSigninInSigninFrame(browser(), "[email protected]", "password");
run_loop.Run();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
#endif // OS_WIN
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
index bab6767..d4ecddf 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
@@ -10,6 +10,7 @@
#include "base/location.h"
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "build/build_config.h"
#include "chrome/browser/lifetime/keep_alive_types.h"
#include "chrome/browser/lifetime/scoped_keep_alive.h"
@@ -46,7 +47,7 @@
void CloseBrowser(Browser* browser) {
browser->window()->Close();
- base::MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
gfx::Rect GetChromeIconBoundsForRootWindow(aura::Window* root_window) {
