Relanding "Add apk for running content_browsertests"

content/test/content_test_launcher.cc

Index: content/test/content_test_launcher.cc
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index 5eebd690f82601eb2d65f9518447b426831947e0..a34db6beed86f9e0efd95604dff592dcfa3f842f 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -17,6 +17,11 @@
 #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"
@@ -52,6 +57,12 @@ class ContentShellTestSuiteInitializer
   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)
@@ -62,6 +73,14 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase {
 
  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 =