Index: net/test/run_all_unittests.cc |
diff --git a/net/test/run_all_unittests.cc b/net/test/run_all_unittests.cc |
index a502eb6a2f62e760eb7fb53b48b40a1880d07428..2cfb258e0db856b98540c2173df5f91bab56273f 100644 |
--- a/net/test/run_all_unittests.cc |
+++ b/net/test/run_all_unittests.cc |
@@ -2,7 +2,6 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/command_line.h" |
#include "base/metrics/statistics_recorder.h" |
#include "base/test/launcher/unit_test_launcher.h" |
#include "build/build_config.h" |
@@ -26,7 +25,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; |
@@ -59,10 +58,6 @@ int main(int argc, char** argv) { |
NetTestSuite test_suite(argc, argv); |
ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false); |
- // TODO(use_chrome_edk): This flag will go away and be default behavior soon, |
- // but we explicitly add it here for test coverage. |
- base::CommandLine::ForCurrentProcess()->AppendSwitch("use-new-edk"); |
- |
#if defined(OS_WIN) && !defined(USE_OPENSSL) |
// We want to be sure to init NSPR on the main thread. |
crypto::EnsureNSPRInit(); |
@@ -73,7 +68,7 @@ int main(int argc, char** argv) { |
net::EnableSSLServerSockets(); |
#if !defined(OS_ANDROID) && !defined(OS_IOS) |
- mojo::embedder::Init(); |
+ mojo::edk::Init(); |
#endif |
return base::LaunchUnitTests( |