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

content/shell/shell_browser_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/shell_browser_main.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/common/webkit_test_helpers.h"
 #include "content/shell/shell.h"
 #include "content/shell/webkit_test_controller.h"
 #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)
 // Path to search for when translating a layout test path to an URL.
 const char kAndroidLayoutTestPath[] =
     "/data/local/tmp/third_party/WebKit/LayoutTests/";
 
 // 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,
                          base::FilePath* current_working_directory,
                          bool* enable_pixel_dumping,
                          std::string* expected_pixel_hash) {
   // A test name is formated like file:///path/to/test'--pixel-test'pixelhash
   std::string path_or_url = test_name;
   std::string pixel_switch;
   std::string pixel_hash;
@@ skipping 72 matching lines @@
 
 }  // namespace
 
 // Main routine for running as the Browser process.
 int ShellBrowserMain(const content::MainFunctionParams& parameters,
                      scoped_ptr<content::BrowserMainRunner>& main_runner) {
   bool layout_test_mode =
       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);
   DCHECK(exit_code < 0)
       << "BrowserMainRunner::Initialize failed in ShellBrowserMain";
 
   if (exit_code >= 0)
     return exit_code;
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 36 matching lines @@
       std::string pixel_hash;
       base::FilePath cwd;
       GURL test_url = GetURLForLayoutTest(
           test_string, &cwd, &enable_pixel_dumps, &pixel_hash);
       if (!content::WebKitTestController::Get()->PrepareForLayoutTest(
               test_url, cwd, enable_pixel_dumps, pixel_hash)) {
         break;
       }
 
       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;
     }
     if (!ran_at_least_once) {
       base::MessageLoop::current()->PostTask(FROM_HERE,
                                              base::MessageLoop::QuitClosure());
       main_runner->Run();
     }
     exit_code = 0;
   }
 
 #if !defined(OS_ANDROID)
   if (!layout_test_mode)
     exit_code = main_runner->Run();
 
   main_runner->Shutdown();
 #endif
 
   return exit_code;
 }