summaryrefslogtreecommitdiffstats
path: root/chrome/test/base/ui_test_utils.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-26 04:45:26 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-26 04:45:26 +0000
commit729eb631a8da3bc48cc2637e90d06b1c1da624f5 (patch)
tree66b2c62e5db360e974fc236250da96dfd55fdeb5 /chrome/test/base/ui_test_utils.cc
parent7fe1bf9bf077105d52b76210b142fb203e0a195b (diff)
downloadchromium_src-729eb631a8da3bc48cc2637e90d06b1c1da624f5.zip
chromium_src-729eb631a8da3bc48cc2637e90d06b1c1da624f5.tar.gz
chromium_src-729eb631a8da3bc48cc2637e90d06b1c1da624f5.tar.bz2
Move ui_test_utils::RunMessageLoop to test_utils so that it can be reused by content_browsertests.
BUG=90448 Review URL: https://chromiumcodereview.appspot.com/10822030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/ui_test_utils.cc')
-rw-r--r--chrome/test/base/ui_test_utils.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc
index 4d8afc6..ef155f6 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -148,21 +148,16 @@ void RunAllPendingMessageAndSendQuit(content::BrowserThread::ID thread_id,
const base::Closure& quit_task) {
MessageLoop::current()->PostTask(FROM_HERE,
MessageLoop::QuitWhenIdleClosure());
- RunMessageLoop();
+ content::RunMessageLoop();
content::BrowserThread::PostTask(thread_id, FROM_HERE, quit_task);
}
} // namespace
-void RunMessageLoop() {
- base::RunLoop run_loop;
- content::RunThisRunLoop(&run_loop);
-}
-
void RunAllPendingInMessageLoop() {
MessageLoop::current()->PostTask(FROM_HERE,
MessageLoop::QuitWhenIdleClosure());
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
}
void RunAllPendingInMessageLoop(content::BrowserThread::ID thread_id) {
@@ -381,7 +376,7 @@ void RegisterAndWait(content::NotificationObserver* observer,
const content::NotificationSource& source) {
content::NotificationRegistrar registrar;
registrar.Add(observer, type, source);
- RunMessageLoop();
+ content::RunMessageLoop();
}
void WaitForBookmarkModelToLoad(BookmarkModel* model) {