summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/api/downloads/downloads_api_unittest.cc2
-rw-r--r--chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc2
-rw-r--r--chrome/browser/extensions/app_notification_browsertest.cc2
-rw-r--r--chrome/browser/extensions/app_process_apitest.cc2
-rw-r--r--chrome/browser/extensions/convert_web_app_browsertest.cc2
-rw-r--r--chrome/browser/extensions/crx_installer_browsertest.cc2
-rw-r--r--chrome/browser/extensions/extension_apitest.cc2
-rw-r--r--chrome/browser/extensions/extension_browsertest.cc6
-rw-r--r--chrome/browser/extensions/extension_function_test_utils.cc2
-rw-r--r--chrome/browser/extensions/extension_test_message_listener.cc2
10 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
index f40d67f..0765f85 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
@@ -193,7 +193,7 @@ class DownloadsEventsListener : public content::NotificationObserver {
return true;
}
waiting_ = true;
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
bool success = !waiting_;
if (waiting_) {
// Print the events that were caught since the last WaitFor() call to help
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
index f464781..79a45e6 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
@@ -69,7 +69,7 @@ class WebstoreInstallListener : public WebstoreInstaller::Delegate {
return;
waiting_ = true;
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
}
bool received_failure() const { return received_failure_; }
diff --git a/chrome/browser/extensions/app_notification_browsertest.cc b/chrome/browser/extensions/app_notification_browsertest.cc
index 321f1c2..73dd7ea 100644
--- a/chrome/browser/extensions/app_notification_browsertest.cc
+++ b/chrome/browser/extensions/app_notification_browsertest.cc
@@ -63,7 +63,7 @@ IN_PROC_BROWSER_TEST_F(AppNotificationTest, SaveClientId) {
browser()->profile(), app, extension_misc::LAUNCH_TAB,
NEW_FOREGROUND_TAB));
if (!interceptor.was_called())
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
EXPECT_TRUE(interceptor.was_called());
ExtensionService* service = browser()->profile()->GetExtensionService();
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index cc73033..61170fc 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -495,7 +495,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromExtension) {
// Wait for app tab to be created and loaded.
test_navigation_observer.WaitForObservation(
- base::Bind(&ui_test_utils::RunMessageLoop),
+ base::Bind(&content::RunMessageLoop),
base::Bind(&MessageLoop::Quit,
base::Unretained(MessageLoopForUI::current())));
diff --git a/chrome/browser/extensions/convert_web_app_browsertest.cc b/chrome/browser/extensions/convert_web_app_browsertest.cc
index 7744ce3..8c20e9c 100644
--- a/chrome/browser/extensions/convert_web_app_browsertest.cc
+++ b/chrome/browser/extensions/convert_web_app_browsertest.cc
@@ -65,7 +65,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionFromWebAppTest, Basic) {
"files/extensions/convert_web_app/application.html"));
if (!installed_extension_)
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
EXPECT_TRUE(installed_extension_);
EXPECT_TRUE(installed_extension_->is_hosted_app());
diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc
index 3026f23..550c2dc 100644
--- a/chrome/browser/extensions/crx_installer_browsertest.cc
+++ b/chrome/browser/extensions/crx_installer_browsertest.cc
@@ -107,7 +107,7 @@ class ExtensionCrxInstallerTest : public ExtensionBrowserTest {
installer->set_allow_silent_install(true);
installer->set_is_gallery_install(true);
installer->InstallCrx(PackExtension(ext_path));
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
EXPECT_TRUE(mock_install_prompt->did_succeed());
return installer;
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 4d89f85..01d40d5 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -51,7 +51,7 @@ bool ExtensionApiTest::ResultCatcher::GetNextResult() {
// empty.
if (results_.empty()) {
waiting_ = true;
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
waiting_ = false;
}
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index b89ae3b..eb319ca 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -85,7 +85,7 @@ const Extension* ExtensionBrowserTest::LoadExtensionWithOptions(
extensions::UnpackedInstaller::Create(service));
installer->set_prompt_for_plugins(false);
installer->Load(path);
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
}
// Find the loaded extension by its path. See crbug.com/59531 for why
@@ -327,7 +327,7 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
installer->InstallCrx(crx_path);
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
}
size_t num_after = service->extensions()->size();
@@ -423,7 +423,7 @@ bool ExtensionBrowserTest::WaitForExtensionViewsToLoad() {
if (!(*iter)->IsLoading()) {
++iter;
} else {
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
// Test activity may have modified the set of extension processes during
// message processing, so re-start the iteration to catch added/removed
diff --git a/chrome/browser/extensions/extension_function_test_utils.cc b/chrome/browser/extensions/extension_function_test_utils.cc
index 47aee00..47c727d 100644
--- a/chrome/browser/extensions/extension_function_test_utils.cc
+++ b/chrome/browser/extensions/extension_function_test_utils.cc
@@ -224,7 +224,7 @@ bool RunFunction(UIThreadExtensionFunction* function,
// message loop until they do.
if (!response_delegate.HasResponse()) {
response_delegate.set_should_post_quit(true);
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
}
EXPECT_TRUE(response_delegate.HasResponse());
diff --git a/chrome/browser/extensions/extension_test_message_listener.cc b/chrome/browser/extensions/extension_test_message_listener.cc
index 1405449..1a98046 100644
--- a/chrome/browser/extensions/extension_test_message_listener.cc
+++ b/chrome/browser/extensions/extension_test_message_listener.cc
@@ -27,7 +27,7 @@ bool ExtensionTestMessageListener::WaitUntilSatisfied() {
if (satisfied_)
return true;
waiting_ = true;
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
return satisfied_;
}