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

Unified Diff: mojo/application/application_test_main_chromium.cc

Issue 1049013004: Add some simple HTMLViewer apptests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use net::SpawnedTestServer instead of mojo:http_server. Created 5 years, 9 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
« no previous file with comments | « mojo/application/BUILD.gn ('k') | mojo/services/html_viewer/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/application/application_test_main_chromium.cc
diff --git a/mojo/application/application_test_main_chromium.cc b/mojo/application/application_test_main_chromium.cc
index e6df84fac7af67f54bb1689a3d421471123241bf..4ce761a8a36ffa7a741c862cc82623a30a6f2c7e 100644
--- a/mojo/application/application_test_main_chromium.cc
+++ b/mojo/application/application_test_main_chromium.cc
@@ -3,6 +3,8 @@
// found in the LICENSE file.
#include "base/at_exit.h"
+#include "base/command_line.h"
+#include "base/test/test_timeouts.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_test_base.h"
@@ -10,5 +12,10 @@ MojoResult MojoMain(MojoHandle handle) {
// An AtExitManager instance is needed to construct message loops.
base::AtExitManager at_exit;
+ // Initialize test timeouts, which requires CommandLine::ForCurrentProcess().
+ // TODO(msw): Plumb relevant command line args before initializing timeouts.
+ base::CommandLine::Init(0, nullptr);
+ TestTimeouts::Initialize();
+
return mojo::test::RunAllTests(handle);
}
« no previous file with comments | « mojo/application/BUILD.gn ('k') | mojo/services/html_viewer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698