| Index: mojo/application/public/cpp/lib/application_test_main.cc
|
| diff --git a/mojo/application/public/cpp/lib/application_test_main.cc b/mojo/application/public/cpp/lib/application_test_main.cc
|
| index 2df150a5693c3aa4f4d7878ec67ae3cf383fb043..9b0aa6b8f4b4e75d46b503fcb32eb23b03257758 100644
|
| --- a/mojo/application/public/cpp/lib/application_test_main.cc
|
| +++ b/mojo/application/public/cpp/lib/application_test_main.cc
|
| @@ -2,13 +2,20 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "base/at_exit.h"
|
| +#include "base/command_line.h"
|
| +#include "base/test/test_timeouts.h"
|
| +#include "mojo/application/public/cpp/application_runner.h"
|
| #include "mojo/application/public/cpp/application_test_base.h"
|
| #include "mojo/public/c/system/main.h"
|
| -#include "mojo/public/cpp/environment/environment.h"
|
|
|
| MojoResult MojoMain(MojoHandle handle) {
|
| - // An Environment instance is needed to construct run loops.
|
| - mojo::Environment environment;
|
| + // An AtExitManager instance is needed to construct message loops.
|
| + base::AtExitManager at_exit;
|
| +
|
| + // Initialize the current process Commandline and test timeouts.
|
| + mojo::ApplicationRunner::InitBaseCommandLine();
|
| + TestTimeouts::Initialize();
|
|
|
| return mojo::test::RunAllTests(handle);
|
| -}
|
| +}
|
|
|