Revert of Build services as standalone executables

services/service_manager/public/cpp/lib/service_runner.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/service_manager/public/cpp/service_runner.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 53 matching lines @@
     // Note that we destruct the message loop first because that might trigger
     // connection error handlers and they might access objects created by the
     // service.
     loop.reset();
     context_.reset();
   }
   return MOJO_RESULT_OK;
 }
 
 MojoResult ServiceRunner::Run(MojoHandle service_request_handle) {
-  return Run(service_request_handle, false);
+  bool init_base = true;
+  if (base::CommandLine::InitializedForCurrentProcess()) {
+    init_base =
+        !base::CommandLine::ForCurrentProcess()->HasSwitch("single-process");
+  }
+  return Run(service_request_handle, init_base);
 }
 
 void ServiceRunner::Quit() {
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 }  // namespace service_manager