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

Unified Diff: components/web_view/test_runner/main.cc

Issue 1308973005: html_viewer/web_view: An app for running layout-tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot/merge Created 5 years, 3 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: components/web_view/test_runner/main.cc
diff --git a/components/nacl/loader/nonsfi/nacl_helper_nonsfi_unittests.cc b/components/web_view/test_runner/main.cc
similarity index 54%
copy from components/nacl/loader/nonsfi/nacl_helper_nonsfi_unittests.cc
copy to components/web_view/test_runner/main.cc
index dbca0a6ade4716da449a3e33fb4893bea03cee30..95bf3df323d4e8fa2d42059e996952bf1ca0a00d 100644
--- a/components/nacl/loader/nonsfi/nacl_helper_nonsfi_unittests.cc
+++ b/components/web_view/test_runner/main.cc
@@ -4,10 +4,13 @@
#include "base/at_exit.h"
#include "base/command_line.h"
-#include "base/test/launcher/test_launcher_nacl_nonsfi.h"
+#include "components/web_view/test_runner/launcher.h"
+#include "mojo/runner/child_process.h"
+#include "mojo/runner/init.h"
-int main(int argc, char* argv[]) {
- base::AtExitManager at_exit;
+int main(int argc, char** argv) {
base::CommandLine::Init(argc, argv);
- return base::TestLauncherNonSfiMain("nacl_helper_nonsfi_unittests_main");
+ base::AtExitManager at_exit;
+ mojo::runner::InitializeLogging();
+ return web_view::LaunchTestRunner(argc, argv);
}
« no previous file with comments | « components/web_view/test_runner/launcher.cc ('k') | components/web_view/test_runner/public/interfaces/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698