| Index: mojo/shell/external_application_test_main.cc
|
| diff --git a/mojo/system/run_all_unittests.cc b/mojo/shell/external_application_test_main.cc
|
| similarity index 68%
|
| copy from mojo/system/run_all_unittests.cc
|
| copy to mojo/shell/external_application_test_main.cc
|
| index 2855e96af00e7a24ee4bfaf50b21212c9afc03a6..bdad5511c59ae014788ffec0797c5a992fdb876d 100644
|
| --- a/mojo/system/run_all_unittests.cc
|
| +++ b/mojo/shell/external_application_test_main.cc
|
| @@ -3,17 +3,18 @@
|
| // found in the LICENSE file.
|
|
|
| #include "base/bind.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/test/launcher/unit_test_launcher.h"
|
| #include "base/test/test_suite.h"
|
| +#include "mojo/embedder/embedder.h"
|
| +#include "mojo/embedder/simple_platform_support.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| int main(int argc, char** argv) {
|
| - // Silence death test thread warnings on Linux. We can afford to run our death
|
| - // tests a little more slowly (< 10 ms per death test on a Z620).
|
| - testing::GTEST_FLAG(death_test_style) = "threadsafe";
|
| + mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>(
|
| + new mojo::embedder::SimplePlatformSupport()));
|
|
|
| base::TestSuite test_suite(argc, argv);
|
| -
|
| return base::LaunchUnitTests(
|
| argc,
|
| argv,
|
|
|