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

Unified Diff: net/test/run_all_unittests.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/test/embedded_test_server/http_request_unittest.cc ('k') | net/third_party/nss/ssl.gyp » ('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 e86487e6fedf51c510db59fd6b9f44a21df4c405..d9cf3540882d859f73ed30ad86ac5e8392bca0ba 100644
--- a/net/test/run_all_unittests.cc
+++ b/net/test/run_all_unittests.cc
@@ -27,6 +27,10 @@
#include "gin/public/isolate_holder.h"
#endif
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h"
+#endif
+
using net::internal::ClientSocketPoolBaseHelper;
using net::SpdySession;
@@ -69,6 +73,10 @@ int main(int argc, char** argv) {
net::ProxyResolverV8::EnsureIsolateCreated();
#endif
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+ mojo::embedder::test::InitWithSimplePlatformSupport();
+#endif
+
return base::LaunchUnitTests(
argc, argv, base::Bind(&NetTestSuite::Run,
base::Unretained(&test_suite)));
« no previous file with comments | « net/test/embedded_test_server/http_request_unittest.cc ('k') | net/third_party/nss/ssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698