| Index: content/test/run_all_unittests.cc
|
| diff --git a/content/test/run_all_unittests.cc b/content/test/run_all_unittests.cc
|
| index 8b403465909c159c9d0f004e8f0312ffa3c448e9..f9195c878fb8db8d958df620fac9a3c62faeed9c 100644
|
| --- a/content/test/run_all_unittests.cc
|
| +++ b/content/test/run_all_unittests.cc
|
| @@ -7,10 +7,8 @@
|
| #include "base/test/launcher/unit_test_launcher.h"
|
| #include "base/test/test_io_thread.h"
|
| #include "build/build_config.h"
|
| -#include "content/app/mojo/mojo_init.h"
|
| #include "content/public/test/unittest_test_suite.h"
|
| #include "content/test/content_test_suite.h"
|
| -#include "third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h"
|
|
|
| #if defined(OS_ANDROID)
|
| #include "base/android/jni_android.h"
|
| @@ -25,15 +23,6 @@ int main(int argc, char** argv) {
|
| #endif
|
| content::UnitTestTestSuite test_suite(
|
| new content::ContentTestSuite(argc, argv));
|
| -#if !defined(OS_IOS)
|
| - content::InitializeMojo();
|
| - base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
|
| - scoped_ptr<mojo::test::ScopedIPCSupport> ipc_support;
|
| - if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")) {
|
| - ipc_support.reset(new mojo::test::ScopedIPCSupport(
|
| - test_io_thread.task_runner()));
|
| - }
|
| -#endif
|
|
|
| return base::LaunchUnitTests(
|
| argc, argv, base::Bind(&content::UnitTestTestSuite::Run,
|
|
|