Revert of Build services as standalone executables

services/service_manager/standalone/context.cc

 // Copyright 2013 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/standalone/context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 20 matching lines @@
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "components/tracing/common/tracing_switches.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/catalog/catalog.h"
 #include "services/catalog/store.h"
 #include "services/service_manager/connect_params.h"
 #include "services/service_manager/connect_util.h"
 #include "services/service_manager/runner/common/switches.h"
+#include "services/service_manager/runner/host/in_process_native_runner.h"
 #include "services/service_manager/runner/host/out_of_process_native_runner.h"
 #include "services/service_manager/standalone/tracer.h"
 #include "services/service_manager/switches.h"
 #include "services/tracing/public/cpp/provider.h"
 #include "services/tracing/public/cpp/switches.h"
 #include "services/tracing/public/interfaces/constants.mojom.h"
 #include "services/tracing/public/interfaces/tracing.mojom.h"
 
 #if defined(OS_MACOSX)
-#include "services/service_manager/public/cpp/standalone_service/mach_broker.h"
+#include "services/service_manager/runner/host/mach_broker.h"
 #endif
 
 namespace service_manager {
 namespace {
 
 base::FilePath::StringType GetPathFromCommandLineSwitch(
     const base::StringPiece& value) {
 #if defined(OS_POSIX)
   return value.as_string();
 #elif defined(OS_WIN)
@@ skipping 68 matching lines @@
       kThreadPoolMaxThreads, "blocking_pool", base::TaskPriority::USER_VISIBLE);
 
   init_edk_ = !init_params || init_params->init_edk;
   if (init_edk_) {
     mojo::edk::InitIPCSupport(this, io_thread_->task_runner().get());
 #if defined(OS_MACOSX)
     mojo::edk::SetMachPortProvider(MachBroker::GetInstance()->port_provider());
 #endif
   }
 
-  std::unique_ptr<NativeRunnerFactory> runner_factory =
-      base::MakeUnique<OutOfProcessNativeRunnerFactory>(
-          blocking_pool_.get(),
-          init_params ? init_params->native_runner_delegate : nullptr);
+  std::unique_ptr<NativeRunnerFactory> runner_factory;
+  if (command_line.HasSwitch(switches::kSingleProcess)) {
+#if defined(COMPONENT_BUILD)
+    LOG(ERROR) << "Running Mojo in single process component build, which isn't "
+               << "supported because statics in apps interact. Use static build"
+               << " or don't pass --single-process.";
+#endif
+    runner_factory.reset(
+        new InProcessNativeRunnerFactory(blocking_pool_.get()));
+  } else {
+    NativeRunnerDelegate* native_runner_delegate = init_params ?
+        init_params->native_runner_delegate : nullptr;
+    runner_factory.reset(new OutOfProcessNativeRunnerFactory(
+        blocking_pool_.get(), native_runner_delegate));
+  }
   std::unique_ptr<catalog::Store> store;
   if (init_params)
     store = std::move(init_params->catalog_store);
   catalog_.reset(
       new catalog::Catalog(blocking_pool_.get(), std::move(store), nullptr));
   service_manager_.reset(new ServiceManager(std::move(runner_factory),
                                             catalog_->TakeService()));
 
   if (command_line.HasSwitch(::switches::kServiceOverrides)) {
     base::FilePath overrides_file(GetPathFromCommandLineSwitch(
@@ skipping 91 matching lines @@
   mojom::InterfaceProviderPtr local_interfaces;
 
   std::unique_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateServiceManagerIdentity());
   params->set_target(Identity(name, mojom::kRootUserID));
   params->set_remote_interfaces(mojo::GetProxy(&remote_interfaces));
   service_manager_->Connect(std::move(params));
 }
 
 }  // namespace service_manager