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

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: . 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/mandoline/app/desktop/main.cc b/components/web_view/test_runner/main.cc
similarity index 64%
copy from mandoline/app/desktop/main.cc
copy to components/web_view/test_runner/main.cc
index a1e26aa7eb8ad538dbe82106134648eb33b8096d..86a869107056acc1edf8c8ff8ca17fee147bfbc4 100644
--- a/mandoline/app/desktop/main.cc
+++ b/components/web_view/test_runner/main.cc
@@ -4,10 +4,9 @@
#include "base/at_exit.h"
#include "base/command_line.h"
-#include "mandoline/app/desktop/launcher_process.h"
+#include "components/web_view/test_runner/launcher.h"
#include "mojo/runner/child_process.h"
#include "mojo/runner/init.h"
-#include "mojo/runner/switches.h"
int main(int argc, char** argv) {
base::CommandLine::Init(argc, argv);
@@ -16,10 +15,5 @@ int main(int argc, char** argv) {
base::AtExitManager at_exit;
mojo::runner::InitializeLogging();
- mojo::runner::WaitForDebuggerIfNecessary();
-
- if (command_line.HasSwitch(switches::kChildProcess))
- return mojo::runner::ChildProcessMain();
-
- return mandoline::LauncherProcessMain(argc, argv);
+ return web_view::LaunchTestRunner(argc, argv);
}

Powered by Google App Engine
This is Rietveld 408576698