ShellClient -> Service

services/shell/runner/host/child_process_host.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/shell/runner/host/child_process_host.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 45 matching lines @@
           base::WaitableEvent::InitialState::NOT_SIGNALED),
       weak_factory_(this) {}
 
 ChildProcessHost::~ChildProcessHost() {
   if (!app_path_.empty()) {
     CHECK(!mojo_ipc_channel_)
         << "Destroying ChildProcessHost before calling Join";
   }
 }
 
-mojom::ShellClientPtr ChildProcessHost::Start(
+mojom::ServicePtr ChildProcessHost::Start(
     const Identity& target,
     const ProcessReadyCallback& callback,
     const base::Closure& quit_closure) {
   DCHECK(!child_process_.IsValid());
 
   const base::CommandLine* parent_command_line =
       base::CommandLine::ForCurrentProcess();
   base::FilePath target_path = parent_command_line->GetProgram();
   // |app_path_| can be empty in tests.
   if (!app_path_.MatchesExtension(FILE_PATH_LITERAL(".mojo")) &&
@@ skipping 14 matching lines @@
   if (target_path != app_path_)
     child_command_line->AppendSwitchPath(switches::kChildProcess, app_path_);
 
   if (start_sandboxed_)
     child_command_line->AppendSwitch(switches::kEnableSandbox);
 
   mojo_ipc_channel_.reset(new mojo::edk::PlatformChannelPair);
   mojo_ipc_channel_->PrepareToPassClientHandleToChildProcess(
       child_command_line.get(), &handle_passing_info_);
 
-  mojom::ShellClientPtr client =
-      PassShellClientRequestOnCommandLine(child_command_line.get(),
+  mojom::ServicePtr client =
+      PassServiceRequestOnCommandLine(child_command_line.get(),
                                           child_token_);
   launch_process_runner_->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&ChildProcessHost::DoLaunch, base::Unretained(this),
                  base::Passed(&child_command_line)),
       base::Bind(&ChildProcessHost::DidStart,
                  weak_factory_.GetWeakPtr(), callback));
   return client;
 }
 
@@ skipping 92 matching lines @@
           child_process_.Handle(),
           mojo::edk::ScopedPlatformHandle(mojo::edk::PlatformHandle(
               mojo_ipc_channel_->PassServerHandle().release().handle)),
           child_token_);
     }
   }
   start_child_process_event_.Signal();
 }
 
 }  // namespace shell