Index: extensions/test/extensions_unittests_main.cc |
diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc |
index ac9e8ddf3efc944e0453c367f11fd87068123550..315ade2fbdc4d083881528a555212aed84549aaa 100644 |
--- a/extensions/test/extensions_unittests_main.cc |
+++ b/extensions/test/extensions_unittests_main.cc |
@@ -7,13 +7,14 @@ |
#include "base/macros.h" |
#include "base/path_service.h" |
#include "base/test/launcher/unit_test_launcher.h" |
+#include "base/test/test_io_thread.h" |
#include "content/public/common/content_client.h" |
#include "content/public/test/content_test_suite_base.h" |
#include "content/public/test/unittest_test_suite.h" |
#include "extensions/common/constants.h" |
#include "extensions/common/extension_paths.h" |
#include "extensions/test/test_extensions_client.h" |
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
+#include "mojo/edk/embedder/embedder.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/gl/test/gl_surface_test_support.h" |
#include "url/url_util.h" |
@@ -110,7 +111,8 @@ void ExtensionsTestSuite::Shutdown() { |
int main(int argc, char** argv) { |
content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv)); |
- mojo::embedder::Init(); |
+ base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); |
+ mojo::edk::Init(test_io_thread.task_runner()); |
return base::LaunchUnitTests(argc, |
argv, |
base::Bind(&content::UnitTestTestSuite::Run, |