content_shell: Move BrowserTestSystemMessageHandler and use it in layout tests for Android

content/shell/shell_browser_main.cc

Index: content/shell/shell_browser_main.cc
diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc
index d2b43b54a840a4db239e241edec3d4ddb6c4aa1c..27936f6780bd0d6c99cb216fc735beaadc67225c 100644
--- a/content/shell/shell_browser_main.cc
+++ b/content/shell/shell_browser_main.cc
@@ -24,6 +24,12 @@
 #include "net/base/net_util.h"
 #include "webkit/support/webkit_support.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#include "base/run_loop.h"
+#include "content/public/test/browser_test_message_pump_android.h"
+#endif
+
 namespace {
 
 #if defined(OS_ANDROID)
@@ -33,6 +39,11 @@ const char kAndroidLayoutTestPath[] =
 
 // The base URL from which layout tests are being served on Android.
 const char kAndroidLayoutTestBase[] = "http://127.0.0.1:8000/all-tests/";
+
+base::MessagePump* CreateMessagePumpForUI() {
+  return new content::BrowserTestMessagePumpAndroid();
+}
+
 #endif
 
 GURL GetURLForLayoutTest(const std::string& test_name,
@@ -125,14 +136,23 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters,
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree);
   base::ScopedTempDir browser_context_path_for_layout_tests;
 
-  // TODO(beverloo): Create the FIFOs required for Android layout tests.
-
   if (layout_test_mode) {
     CHECK(browser_context_path_for_layout_tests.CreateUniqueTempDir());
     CHECK(!browser_context_path_for_layout_tests.path().MaybeAsASCII().empty());
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kContentShellDataPath,
         browser_context_path_for_layout_tests.path().MaybeAsASCII());
+
+#if defined(OS_ANDROID)
+    // TODO(beverloo): Create the FIFOs required for Android layout tests.
+
+    JNIEnv* env = base::android::AttachCurrentThread();
+    content::BrowserTestMessagePumpAndroid::RegisterJni(env);
+
+    const bool success = base::MessageLoop::InitMessagePumpForUIFactory(
+        &CreateMessagePumpForUI);
+    CHECK(success) << "Unable to initialize the message pump for Android.";
+#endif
   }
 
   int exit_code = main_runner->Initialize(parameters);
@@ -189,7 +209,14 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters,
       }
 
       ran_at_least_once = true;
+#if defined(OS_ANDROID)
+      // Android never invokes BrowserMainRunner::Run(). Instead, use a bare
+      // base::RunLoop which is closer to what's being used.

[bulach, 2013/06/17 17:41:22]

I guess this deserves a slightly more detailed explanation, something along the
lines of:

// The android system manages the main message loop
// in the java side, and it doesn't provide any blocking
// Run() method.
// When running layout tests, create a nested message loop
// and use base::RunLoop() so that it can block until Quit().


on a tangential note, unrelated to your patch: it'd be nice to have separate
methods for all these chunks "if (layout_test_mode) { ... }", so that it's
clearer this won't affect content shell in "regular" mode..

[Peter Beverloo, 2013/06/17 18:41:56]

I clarified the comment.  I also agree that this code could benefit from some
refactoring, let me do that in a follow-up patch.

+      base::RunLoop run_loop;
+      run_loop.Run();
+#else
       main_runner->Run();
+#endif
 
       if (!content::WebKitTestController::Get()->ResetAfterLayoutTest())
         break;