summaryrefslogtreecommitdiffstats
path: root/content/test/content_test_launcher.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/test/content_test_launcher.cc')
-rw-r--r--content/test/content_test_launcher.cc19
1 files changed, 0 insertions, 19 deletions
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 =