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.cc11
1 files changed, 2 insertions, 9 deletions
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index d819165..d351e91 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -21,17 +21,13 @@
#if defined(OS_ANDROID)
#include "base/message_loop/message_loop.h"
+#include "content/app/mojo/mojo_init.h"
#include "content/common/url_schemes.h"
#include "content/public/common/content_paths.h"
#include "content/public/test/nested_message_pump_android.h"
#include "content/shell/browser/shell_content_browser_client.h"
#include "content/shell/common/shell_content_client.h"
#include "ui/base/ui_base_paths.h"
-
-#if defined(USE_MOJO)
-#include "content/app/mojo/mojo_init.h"
-#endif
-
#endif
namespace content {
@@ -73,19 +69,16 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase {
ui::RegisterPathProvider();
RegisterInProcessThreads();
-#if defined(USE_MOJO)
InitializeMojo();
#endif
-#endif
-
ContentTestSuiteBase::Initialize();
}
virtual void Shutdown() OVERRIDE {
ContentTestSuiteBase::Shutdown();
-#if defined(OS_ANDROID) && defined(USE_MOJO)
+#if defined(OS_ANDROID)
ShutdownMojo();
#endif
}