Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1156)

Unified Diff: mojo/application/public/cpp/lib/application_test_main.cc

Issue 1142323003: Remove duplicate application cpp files in mojo/application. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
-}
+}
« no previous file with comments | « mojo/application/public/cpp/lib/application_test_base.cc ('k') | mojo/application/public/cpp/lib/content_handler_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698