From 5844ab0c6a41cc9d306f8c355cc7ceb5e290cbb1 Mon Sep 17 00:00:00 2001 From: "nileshagrawal@chromium.org" Date: Mon, 28 Jan 2013 23:20:06 +0000 Subject: Revert 179189 Failed to rename package name in buildbot scripts. Broke buildbots. > Add apk for running content_browsertests > > Split off org.chromium.content_shell into: > org.chromium.content_shell - content shell java code, builds a jar, directory structure similar to other jar targets > org.chromium.content_shell_apk - application code to build content_shell_apk, directory structure similar to that of android application > org.chromium.content_browsertests_apk - application code to build content_browsertests_apk > > Also splitting content/shell/android/res into: > - content/shell/android/java/res > - content/shell/android/shell_apk/res > > Both content_shell_apk and content_browsertests_apk will depend on content_shell_java target to include java/res needed to show a shell based browser. > > I will do another CL to move The java files for content_shell_tests_apk to content_shell_apk package. > > BUG=138275 > > > Review URL: https://chromiumcodereview.appspot.com/12047068 TBR=nileshagrawal@chromium.org Review URL: https://codereview.chromium.org/12088031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179211 0039d316-1c4b-4281-b951-d872f2087c98 --- content/test/content_test_launcher.cc | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'content/test/content_test_launcher.cc') diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc index a34db6b..5eebd690 100644 --- a/content/test/content_test_launcher.cc +++ b/content/test/content_test_launcher.cc @@ -17,11 +17,6 @@ #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" @@ -57,12 +52,6 @@ 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) @@ -73,14 +62,6 @@ 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 = -- cgit v1.1