Index: mojo/edk/test/run_all_unittests.cc |
diff --git a/third_party/mojo/src/mojo/edk/test/run_all_unittests.cc b/mojo/edk/test/run_all_unittests.cc |
similarity index 76% |
copy from third_party/mojo/src/mojo/edk/test/run_all_unittests.cc |
copy to mojo/edk/test/run_all_unittests.cc |
index 34c36ed386c970211dec431e2de1c0fd4f67ec0c..23266444d925e89e17788de0c0769e50ddcc1cf1 100644 |
--- a/third_party/mojo/src/mojo/edk/test/run_all_unittests.cc |
+++ b/mojo/edk/test/run_all_unittests.cc |
@@ -6,11 +6,13 @@ |
#include "base/bind.h" |
#include "base/test/launcher/unit_test_launcher.h" |
+#include "base/test/test_io_thread.h" |
#include "base/test/test_suite.h" |
+#include "mojo/edk/embedder/embedder.h" |
+#include "mojo/edk/test/scoped_ipc_support.h" |
+#include "mojo/edk/test/test_support_impl.h" |
#include "mojo/public/tests/test_support_private.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" |
-#include "third_party/mojo/src/mojo/edk/test/test_support_impl.h" |
int main(int argc, char** argv) { |
#if !defined(OS_ANDROID) |
@@ -30,8 +32,10 @@ int main(int argc, char** argv) { |
base::TestSuite test_suite(argc, argv); |
- mojo::embedder::test::InitWithSimplePlatformSupport(); |
- mojo::test::TestSupport::Init(new mojo::test::TestSupportImpl()); |
+ mojo::edk::Init(); |
+ mojo::test::TestSupport::Init(new mojo::edk::test::TestSupportImpl()); |
+ base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); |
+ mojo::edk::test::ScopedIPCSupport ipc_support(test_io_thread.task_runner()); |
return base::LaunchUnitTests( |
argc, argv, |