summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 18:55:44 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 18:55:44 +0000
commitaa169a5c0466adfaacab6d9a564152fc8dd07334 (patch)
tree1ee5bae45aeade3bebe983c06f5441b2909fb158 /chrome/test
parentdfd84dc27cf22557957e4d6634bb0ab3cd74dbbd (diff)
downloadchromium_src-aa169a5c0466adfaacab6d9a564152fc8dd07334.zip
chromium_src-aa169a5c0466adfaacab6d9a564152fc8dd07334.tar.gz
chromium_src-aa169a5c0466adfaacab6d9a564152fc8dd07334.tar.bz2
Use dispatcher to run all pending message at the end of browser tets.
BUG=none TEST=none Review URL: http://codereview.chromium.org/8552004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109917 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/base/in_process_browser_test.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index 75871cb..14ead06 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -44,6 +44,10 @@
#include "base/mac/scoped_nsautorelease_pool.h"
#endif
+#if defined(USE_AURA)
+#include "ui/aura/desktop.h"
+#endif
+
// Passed as value of kTestType.
static const char kBrowserTestType[] = "browser";
@@ -269,7 +273,12 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
#endif
// Pump startup related events.
+#if defined(USE_AURA)
+ MessageLoopForUI::current()->RunAllPendingWithDispatcher(
+ aura::Desktop::GetInstance()->GetDispatcher());
+#else
MessageLoopForUI::current()->RunAllPending();
+#endif
#if defined(OS_MACOSX)
pool.Recycle();
#endif