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

Unified Diff: content/test/content_test_suite.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 | « content/test/content_test_suite.h ('k') | content/test/run_all_unittests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/content_test_suite.cc
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
index 2cb9731ea48e08a9dce3440f52387cf5f78b34b5..94c92012d70be71a70fba126d7aff02c2cc93069 100644
--- a/content/test/content_test_suite.cc
+++ b/content/test/content_test_suite.cc
@@ -13,6 +13,7 @@
#include "content/public/common/content_paths.h"
#include "content/public/test/test_content_client_initializer.h"
#include "gpu/config/gpu_util.h"
+#include "mojo/edk/embedder/embedder.h"
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_WIN)
@@ -68,7 +69,8 @@ class TestInitializationListener : public testing::EmptyTestEventListener {
} // namespace
ContentTestSuite::ContentTestSuite(int argc, char** argv)
- : ContentTestSuiteBase(argc, argv) {
+ : ContentTestSuiteBase(argc, argv),
+ test_io_thread_(base::TestIOThread::kAutoStart) {
}
ContentTestSuite::~ContentTestSuite() {
@@ -92,6 +94,7 @@ void ContentTestSuite::Initialize() {
ContentTestSuiteBase::RegisterContentSchemes(&client);
}
RegisterPathProvider();
+ mojo::edk::Init(test_io_thread_.task_runner());
#if !defined(OS_IOS)
media::InitializeMediaLibrary();
// When running in a child process for Mac sandbox tests, the sandbox exists
« no previous file with comments | « content/test/content_test_suite.h ('k') | content/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698