ApplicationImpl->ShellConnection, mojom::Application->mojom::ShellClient

mojo/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 "mojo/shell/runner/host/child_process_host.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 95 matching lines @@
     // With the new EDK, bootstrap message pipes are created asynchronously.
     // We recieve the bound pipe (if successful) on an arbitrary thread,
     // stash it in the thread-safe |pipe_holder_|, and then try to call
     // OnMessagePipeCreated() on the host's main thread.
     //
     // Because of the way the launcher process shuts down, it's possible for
     // the main thread's MessageLoop to stop running (but not yet be destroyed!)
     // while this boostrap is pending, resulting in OnMessagePipeCreated() never
     // being called.
     //
-    // A typical child process (i.e. one using ApplicationImpl to bind the other
+    // A typical child process (i.e. one using ShellConnection to bind the other
     // end of this pipe) may hang forever waiting for an Initialize() message
     // unless the pipe is closed. This in turn means that Join() could hang
     // waiting for the process to exit. Deadlock!
     //
     // |pipe_holder_| exists for this reason. If it's still holding onto the
     // pipe when Join() is called, the pipe will be closed.
     DCHECK(!primordial_pipe_token_.empty());
     edk::CreateParentMessagePipe(
         primordial_pipe_token_,
         base::Bind(&OnParentMessagePipeCreated, pipe_holder_,
@@ skipping 22 matching lines @@
   int rv = -1;
   LOG_IF(ERROR, !child_process_.WaitForExit(&rv))
       << "Failed to wait for child process";
 
   child_process_.Close();
 
   return rv;
 }
 
 void ChildProcessHost::StartApp(
-    InterfaceRequest<mojom::Application> application_request,
+    InterfaceRequest<mojom::ShellClient> request,
     const mojom::ChildController::StartAppCallback& on_app_complete) {
   DCHECK(controller_);
 
   on_app_complete_ = on_app_complete;
   controller_->StartApp(
-      std::move(application_request),
+      std::move(request),
       base::Bind(&ChildProcessHost::AppCompleted, weak_factory_.GetWeakPtr()));
 }
 
 void ChildProcessHost::ExitNow(int32_t exit_code) {
   DCHECK(controller_);
 
   controller_->ExitNow(exit_code);
 }
 
 void ChildProcessHost::DidStart() {
@@ skipping 126 matching lines @@
     scoped_refptr<PipeHolder> holder,
     scoped_refptr<base::TaskRunner> callback_task_runner,
     const base::Closure& callback,
     ScopedMessagePipeHandle pipe) {
   holder->SetPipe(std::move(pipe));
   callback_task_runner->PostTask(FROM_HERE, callback);
 }
 
 }  // namespace shell
 }  // namespace mojo