| Index: services/service_manager/standalone/desktop/main_helper.cc
|
| diff --git a/services/service_manager/standalone/desktop/main_helper.cc b/services/service_manager/standalone/desktop/main_helper.cc
|
| index 45d2f03f7fe1f7ad937da3d886269c3f6a31ebcd..d3f11c8c588e64db843f2bcf38ad02a972d2db02 100644
|
| --- a/services/service_manager/standalone/desktop/main_helper.cc
|
| +++ b/services/service_manager/standalone/desktop/main_helper.cc
|
| @@ -15,6 +15,7 @@
|
| #include "base/strings/string_split.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "services/service_manager/runner/common/switches.h"
|
| +#include "services/service_manager/runner/host/child_process.h"
|
| #include "services/service_manager/runner/init.h"
|
| #include "services/service_manager/standalone/desktop/launcher_process.h"
|
|
|
| @@ -28,6 +29,8 @@
|
|
|
| int StandaloneServiceManagerMain(int argc, char** argv) {
|
| base::CommandLine::Init(argc, argv);
|
| + const base::CommandLine& command_line =
|
| + *base::CommandLine::ForCurrentProcess();
|
|
|
| base::AtExitManager at_exit;
|
| InitializeLogging();
|
| @@ -37,6 +40,9 @@
|
| base::RouteStdioToConsole(false);
|
| #endif
|
|
|
| + if (command_line.HasSwitch(switches::kChildProcess))
|
| + return ChildProcessMain();
|
| +
|
| return LauncherProcessMain();
|
| }
|
|
|
|
|