| Index: mojo/edk/system/run_all_unittests.cc
|
| diff --git a/third_party/mojo/src/mojo/edk/system/run_all_unittests.cc b/mojo/edk/system/run_all_unittests.cc
|
| similarity index 79%
|
| copy from third_party/mojo/src/mojo/edk/system/run_all_unittests.cc
|
| copy to mojo/edk/system/run_all_unittests.cc
|
| index cd6133741bbc3e2a12817fded892a29ee382f92b..b68f6e207e4c415f350b686b3d3f22eba16f9800 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/run_all_unittests.cc
|
| +++ b/mojo/edk/system/run_all_unittests.cc
|
| @@ -3,8 +3,10 @@
|
| // found in the LICENSE file.
|
|
|
| #include "base/bind.h"
|
| +#include "base/command_line.h"
|
| #include "base/test/launcher/unit_test_launcher.h"
|
| #include "base/test/test_suite.h"
|
| +#include "mojo/edk/embedder/embedder.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| int main(int argc, char** argv) {
|
| @@ -15,8 +17,10 @@ int main(int argc, char** argv) {
|
| #if !defined(OS_ANDROID)
|
| testing::GTEST_FLAG(death_test_style) = "threadsafe";
|
| #endif
|
| -
|
| + mojo::edk::Init();
|
| base::TestSuite test_suite(argc, argv);
|
| + // TODO(use_chrome_edk): temporary to force new EDK.
|
| + base::CommandLine::ForCurrentProcess()->AppendSwitch("--use-new-edk");
|
|
|
| return base::LaunchUnitTests(
|
| argc, argv,
|
|
|