Index: components/test/run_all_unittests.cc |
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc |
index 77c8559d71f4034d0cc9d770f90318f13ab8d0eb..4c8ceeac46569a1df99f5118daea99713caa7d90 100644 |
--- a/components/test/run_all_unittests.cc |
+++ b/components/test/run_all_unittests.cc |
@@ -8,7 +8,8 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/metrics/statistics_recorder.h" |
#include "base/path_service.h" |
-#include "base/test/launcher/unit_test_launcher.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 "components/content_settings/core/common/content_settings_pattern.h" |
@@ -35,7 +36,7 @@ |
#endif |
#if defined(OS_CHROMEOS) |
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
+#include "mojo/edk/embedder/embedder.h" |
#endif |
namespace { |
@@ -143,8 +144,9 @@ int main(int argc, char** argv) { |
testing::UnitTest::GetInstance()->listeners(); |
listeners.Append(new ComponentsUnitTestEventListener()); |
-#if defined(OS_CHROMEOS) |
- mojo::embedder::Init(); |
+#if defined(OS_CHROMEOS) |
+ base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); |
+ mojo::edk::Init(test_io_thread.task_runner()); |
#endif |
return base::LaunchUnitTests( |