Revert of Build services as standalone executables

services/service_manager/background/background_service_manager_main.cc

Index: services/service_manager/background/background_service_manager_main.cc
diff --git a/services/service_manager/background/background_service_manager_main.cc b/services/service_manager/background/background_service_manager_main.cc
index 6902ee46104b02e86f0aa1c900e3b6a550283199..4ef836fc4922d4b50dfa652bf887f2bd43c7a6b5 100644
--- a/services/service_manager/background/background_service_manager_main.cc
+++ b/services/service_manager/background/background_service_manager_main.cc
@@ -9,8 +9,33 @@
 #include "base/debug/debugger.h"
 #include "base/process/launch.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"
 
+namespace service_manager {
+namespace {
+
+int RunChildProcess() {
+  base::AtExitManager at_exit;
+  InitializeLogging();
+  WaitForDebuggerIfNecessary();
+#if !defined(OFFICIAL_BUILD) && defined(OS_WIN)
+  base::RouteStdioToConsole(false);
+#endif
+  return ChildProcessMain();
+}
+
+}  // namespace
+}  // namespace service_manager
+
 int main(int argc, char** argv) {
+  base::CommandLine::Init(argc, argv);
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kChildProcess)) {
+    return service_manager::RunChildProcess();
+  }
+  // Reset CommandLine as most likely main() is going to use CommandLine too
+  // and expect to be able to initialize it.
+  base::CommandLine::Reset();
   return MasterProcessMain(argc, argv);
 }