Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(535)

Unified Diff: mojo/runner/host/host_unittests.cc

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/runner/host/child_process_host_unittest.cc ('k') | mojo/shell/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/host/host_unittests.cc
diff --git a/mojo/runner/host/host_unittests.cc b/mojo/runner/host/host_unittests.cc
index 37ae2218396debebbb75845b3e304d47c65bc2d6..406b30f6eb10f9007e2488b031e2a6741ee668d7 100644
--- a/mojo/runner/host/host_unittests.cc
+++ b/mojo/runner/host/host_unittests.cc
@@ -7,12 +7,13 @@
#include "base/command_line.h"
#include "base/logging.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/runner/host/child_process.h"
#include "mojo/runner/host/switches.h"
#include "mojo/runner/init.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
int main(int argc, char** argv) {
base::CommandLine::Init(argc, argv);
@@ -27,9 +28,11 @@ int main(int argc, char** argv) {
return mojo::runner::ChildProcessMain();
}
- mojo::embedder::Init();
-
base::TestSuite test_suite(argc, argv);
+
+ base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
+ mojo::edk::Init(test_io_thread.task_runner());
+
return base::LaunchUnitTests(
argc, argv,
base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
« no previous file with comments | « mojo/runner/host/child_process_host_unittest.cc ('k') | mojo/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698