Index: chrome/test/base/run_all_unittests.cc |
diff --git a/chrome/test/base/run_all_unittests.cc b/chrome/test/base/run_all_unittests.cc |
index 1e436974399b838948cfe0e4a6e5ffa14b25d22c..60f2d3a8ed9fbe89715e41daa6504717bed834dc 100644 |
--- a/chrome/test/base/run_all_unittests.cc |
+++ b/chrome/test/base/run_all_unittests.cc |
@@ -7,16 +7,12 @@ |
#include "base/test/launcher/unit_test_launcher.h" |
#include "chrome/test/base/chrome_unit_test_suite.h" |
#include "content/public/test/unittest_test_suite.h" |
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
+#include "mojo/edk/embedder/embedder.h" |
int main(int argc, char **argv) { |
content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv)); |
- // 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"); |
- |
- mojo::embedder::Init(); |
+ mojo::edk::Init(); |
return base::LaunchUnitTests( |
argc, argv, base::Bind(&content::UnitTestTestSuite::Run, |
base::Unretained(&test_suite))); |