Commit aa169a5c authored by oshima@chromium.org's avatar oshima@chromium.org

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
parent dfd84dc2
...@@ -44,6 +44,10 @@ ...@@ -44,6 +44,10 @@
#include "base/mac/scoped_nsautorelease_pool.h" #include "base/mac/scoped_nsautorelease_pool.h"
#endif #endif
#if defined(USE_AURA)
#include "ui/aura/desktop.h"
#endif
// Passed as value of kTestType. // Passed as value of kTestType.
static const char kBrowserTestType[] = "browser"; static const char kBrowserTestType[] = "browser";
...@@ -269,7 +273,12 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() { ...@@ -269,7 +273,12 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
#endif #endif
// Pump startup related events. // Pump startup related events.
#if defined(USE_AURA)
MessageLoopForUI::current()->RunAllPendingWithDispatcher(
aura::Desktop::GetInstance()->GetDispatcher());
#else
MessageLoopForUI::current()->RunAllPending(); MessageLoopForUI::current()->RunAllPending();
#endif
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
pool.Recycle(); pool.Recycle();
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment