Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: chrome/test/base/in_process_browser_test.cc

Issue 8571026: Fix fullscreen mode on aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git-try -b win_aura,linux_aura,win,linux_chromeos Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/base/in_process_browser_test.cc
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index 14ead0611e32c4b01f5a742e7082f299d9e5e73a..cb9e45dd0372d91096f62036fd60d63639f288ce 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -48,8 +48,21 @@
#include "ui/aura/desktop.h"
#endif
+namespace {
+
// Passed as value of kTestType.
-static const char kBrowserTestType[] = "browser";
+const char kBrowserTestType[] = "browser";
+
+void RunAllPendingInMessageLoop() {
+#if defined(USE_AURA)
+ MessageLoopForUI::current()->RunAllPendingWithDispatcher(
+ aura::Desktop::GetInstance()->GetDispatcher());
+#else
+ MessageLoopForUI::current()->RunAllPending();
+#endif
+}
+
+} // namespace
InProcessBrowserTest::InProcessBrowserTest()
: browser_(NULL),
@@ -273,12 +286,8 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
#endif
// Pump startup related events.
-#if defined(USE_AURA)
- MessageLoopForUI::current()->RunAllPendingWithDispatcher(
- aura::Desktop::GetInstance()->GetDispatcher());
-#else
- MessageLoopForUI::current()->RunAllPending();
-#endif
+ RunAllPendingInMessageLoop();
+
#if defined(OS_MACOSX)
pool.Recycle();
#endif
@@ -290,7 +299,7 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
// Pump any pending events that were created as a result of creating a
// browser.
- MessageLoopForUI::current()->RunAllPending();
+ RunAllPendingInMessageLoop();
SetUpOnMainThread();
#if defined(OS_MACOSX)

Powered by Google App Engine
This is Rietveld 408576698