| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/at_exit.h" | 5 #include "base/at_exit.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "mandoline/app/desktop/launcher_process.h" | 7 #include "components/web_view/test_runner/launcher.h" |
| 8 #include "mojo/runner/child_process.h" | 8 #include "mojo/runner/child_process.h" |
| 9 #include "mojo/runner/init.h" | 9 #include "mojo/runner/init.h" |
| 10 #include "mojo/runner/switches.h" | |
| 11 | 10 |
| 12 int main(int argc, char** argv) { | 11 int main(int argc, char** argv) { |
| 13 base::CommandLine::Init(argc, argv); | 12 base::CommandLine::Init(argc, argv); |
| 14 const base::CommandLine& command_line = | 13 const base::CommandLine& command_line = |
| 15 *base::CommandLine::ForCurrentProcess(); | 14 *base::CommandLine::ForCurrentProcess(); |
| 16 | 15 |
| 17 base::AtExitManager at_exit; | 16 base::AtExitManager at_exit; |
| 18 mojo::runner::InitializeLogging(); | 17 mojo::runner::InitializeLogging(); |
| 19 mojo::runner::WaitForDebuggerIfNecessary(); | 18 return web_view::LaunchTestRunner(argc, argv); |
| 20 | |
| 21 if (command_line.HasSwitch(switches::kChildProcess)) | |
| 22 return mojo::runner::ChildProcessMain(); | |
| 23 | |
| 24 return mandoline::LauncherProcessMain(argc, argv); | |
| 25 } | 19 } |
| OLD | NEW |