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

Unified Diff: net/test/run_all_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 | « net/net.gyp ('k') | testing/buildbot/gn_isolate_map.pyl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/run_all_unittests.cc
diff --git a/net/test/run_all_unittests.cc b/net/test/run_all_unittests.cc
index 87f757ac402c3ac7f91af07ff7e5093f7c474108..244dfb700d97e32d9b101e8c27fa4350b31a9183 100644
--- a/net/test/run_all_unittests.cc
+++ b/net/test/run_all_unittests.cc
@@ -4,6 +4,7 @@
#include "base/metrics/statistics_recorder.h"
#include "base/test/launcher/unit_test_launcher.h"
+#include "base/test/test_io_thread.h"
#include "build/build_config.h"
#include "crypto/nss_util.h"
#include "net/socket/client_socket_pool_base.h"
@@ -25,7 +26,7 @@
#endif
#if !defined(OS_ANDROID) && !defined(OS_IOS)
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/embedder.h"
#endif
using net::internal::ClientSocketPoolBaseHelper;
@@ -54,7 +55,8 @@ int main(int argc, char** argv) {
kNetTestRegisteredMethods,
arraysize(kNetTestRegisteredMethods));
#endif
-
+
+ scoped_refptr<base::TaskRunner> io_task_runner;
NetTestSuite test_suite(argc, argv);
ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false);
@@ -68,7 +70,9 @@ int main(int argc, char** argv) {
net::EnableSSLServerSockets();
#if !defined(OS_ANDROID) && !defined(OS_IOS)
- mojo::embedder::Init();
+ base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
+ io_task_runner = test_io_thread.task_runner();
+ mojo::edk::Init(io_task_runner.get());
#endif
return base::LaunchUnitTests(
« no previous file with comments | « net/net.gyp ('k') | testing/buildbot/gn_isolate_map.pyl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698