Index: components/test/run_all_unittests.cc |
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc |
index bb8caa4f3d56101a79aab796a41c22a0e2531cb6..4263b424ad5bbfcf8bad578f47f9e225408d3447 100644 |
--- a/components/test/run_all_unittests.cc |
+++ b/components/test/run_all_unittests.cc |
@@ -36,7 +36,7 @@ |
#endif |
#if defined(OS_CHROMEOS) |
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
+#include "mojo/edk/embedder/embedder.h" |
#endif |
namespace { |
@@ -138,10 +138,6 @@ class ComponentsUnitTestEventListener : public testing::EmptyTestEventListener { |
int main(int argc, char** argv) { |
ComponentsTestSuite test_suite(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"); |
- |
// The listener will set up common test environment for all components unit |
// tests. |
testing::TestEventListeners& listeners = |
@@ -149,7 +145,7 @@ int main(int argc, char** argv) { |
listeners.Append(new ComponentsUnitTestEventListener()); |
#if defined(OS_CHROMEOS) |
- mojo::embedder::Init(); |
+ mojo::edk::Init(); |
#endif |
return base::LaunchUnitTests( |