Consolidating the mojo NativeRunner functionality.

services/service_manager/background/background_service_manager.cc

 // Copyright 2016 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/background/background_service_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 81 matching lines @@
   void Run() override {
     // The construction/destruction order is very finicky and has to be done
     // in the order here.
     std::unique_ptr<base::MessageLoop> message_loop(message_loop_);
 
     std::unique_ptr<Context::InitParams> context_init_params(
         new Context::InitParams);
     if (init_params_) {
       context_init_params->catalog_store =
           std::move(init_params_->catalog_store);
-      context_init_params->native_runner_delegate =
-          init_params_->native_runner_delegate;
+      context_init_params->service_process_launcher_delegate =
+          init_params_->service_process_launcher_delegate;
       context_init_params->init_edk = init_params_->init_edk;
     }
     if (context_init_params->init_edk)
       Context::EnsureEmbedderIsInitialized();
 
     message_loop_->BindToCurrentThread();
 
     std::unique_ptr<Context> context(new Context);
     context_ = context.get();
     context_->Init(std::move(context_init_params));
@@ skipping 56 matching lines @@
 }
 
 void BackgroundServiceManager::ExecuteOnServiceManagerThread(
     const ServiceManagerThreadCallback& callback) {
   thread_->message_loop()->task_runner()->PostTask(
       FROM_HERE, base::Bind(&MojoThread::RunServiceManagerCallback,
                             base::Unretained(thread_.get()), callback));
 }
 
 }  // namespace service_manager