Relanding "Add apk for running content_browsertests"

content/test/content_test_launcher.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/public/test/test_launcher.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/test/test_suite.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_test_suite_base.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "content/shell/shell_content_client.h"
 #include "content/shell/shell_main_delegate.h"
 #include "content/shell/shell_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_ANDROID)
+#include "base/message_loop.h"
+#include "base/message_pump_android.h"
+#endif
+
 #if defined(OS_WIN)
 #include "content/public/app/startup_helper_win.h"
 #include "sandbox/win/src/sandbox_types.h"
 #endif  // defined(OS_WIN)
 
 namespace content {
 
 class ContentShellTestSuiteInitializer
     : public testing::EmptyTestEventListener {
  public:
@@ skipping 15 matching lines @@
     SetContentClient(NULL);
   }
 
  private:
   scoped_ptr<ShellContentClient> content_client_;
   scoped_ptr<ShellContentBrowserClient> browser_content_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentShellTestSuiteInitializer);
 };
 
+#if defined(OS_ANDROID)
+base::MessagePump* CreateMessagePumpForUI() {
+  return new base::MessagePumpForUI();
+};
+#endif
+
 class ContentBrowserTestSuite : public ContentTestSuiteBase {
  public:
   ContentBrowserTestSuite(int argc, char** argv)
       : ContentTestSuiteBase(argc, argv) {
   }
   virtual ~ContentBrowserTestSuite() {
   }
 
  protected:
   virtual void Initialize() OVERRIDE {
+
+#if defined(OS_ANDROID)
+    // This needs to be done before base::TestSuite::Initialize() is called,
+    // as it also tries to set MessagePumpForUIFactory.
+    if (!MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUI))
+      LOG(INFO) << "MessagePumpForUIFactory already set, unable to override.";
+#endif
+
     ContentTestSuiteBase::Initialize();
 
     testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
     listeners.Append(new ContentShellTestSuiteInitializer);
   }
   virtual void Shutdown() OVERRIDE {
     base::TestSuite::Shutdown();
   }
 
@@ skipping 33 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate);
 };
 
 }  // namespace content
 
 int main(int argc, char** argv) {
   content::ContentTestLauncherDelegate launcher_delegate;
   return LaunchTests(&launcher_delegate, argc, argv);
 }