Index: url/run_all_unittests.cc |
diff --git a/ipc/mojo/run_all_unittests.cc b/url/run_all_unittests.cc |
similarity index 60% |
copy from ipc/mojo/run_all_unittests.cc |
copy to url/run_all_unittests.cc |
index f0b5dbc4c43b4bad046679523a40279d30a012f3..85c30b426fe45f1149eaa6d91e461b9f738c3648 100644 |
--- a/ipc/mojo/run_all_unittests.cc |
+++ b/url/run_all_unittests.cc |
@@ -1,13 +1,15 @@ |
-// Copyright 2014 The Chromium Authors. All rights reserved. |
+// Copyright 2016 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/at_exit.h" |
#include "base/bind.h" |
-#include "base/test/launcher/unit_test_launcher.h" |
+#include "base/message_loop/message_loop.h" |
+#include "base/test/launcher/unit_test_launcher.h" |
+#include "base/test/test_io_thread.h" |
#include "base/test/test_suite.h" |
-#include "build/build_config.h" |
-#include "mojo/edk/embedder/embedder.h" |
+#include "build/build_config.h" |
+#include "mojo/edk/embedder/embedder.h" |
+#include "mojo/edk/test/scoped_ipc_support.h" |
#if defined(OS_ANDROID) |
#include "base/android/jni_android.h" |
@@ -20,8 +22,14 @@ int main(int argc, char** argv) { |
base::RegisterContentUriTestUtils(env); |
#endif |
base::TestSuite test_suite(argc, argv); |
- mojo::edk::Init(); |
- return base::LaunchUnitTestsSerially( |
+ |
+ mojo::edk::Init(); |
+ base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); |
+ scoped_ptr<mojo::edk::test::ScopedIPCSupport> ipc_support; |
+ ipc_support.reset( |
+ new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner())); |
+ |
+ return base::LaunchUnitTests( |
argc, argv, |
base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); |
} |