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

mojo/shell/runner/host/child_process.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.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 217 matching lines @@
   }
 
   void OnConnectionError() {
     // A connection error means the connection to the shell is lost. This is not
     // recoverable.
     LOG(ERROR) << "Connection error to the shell.";
     _exit(1);
   }
 
   // |ChildController| methods:
-  void StartApp(InterfaceRequest<mojom::Application> application_request,
+  void StartApp(InterfaceRequest<mojom::ShellClient> request,
                 const StartAppCallback& on_app_complete) override {
     DCHECK(thread_checker_.CalledOnValidThread());
 
     on_app_complete_ = on_app_complete;
     unblocker_.Unblock(base::Bind(&ChildControllerImpl::StartAppOnMainThread,
                                   base::Unretained(app_library_),
-                                  base::Passed(&application_request)));
+                                  base::Passed(&request)));
   }
 
   void ExitNow(int32_t exit_code) override {
     DVLOG(2) << "ChildControllerImpl::ExitNow(" << exit_code << ")";
     _exit(exit_code);
   }
 
  private:
   ChildControllerImpl(AppContext* app_context,
                       base::NativeLibrary app_library,
                       const Blocker::Unblocker& unblocker)
       : app_library_(app_library), unblocker_(unblocker), binding_(this) {}
 
   static void StartAppOnMainThread(
       base::NativeLibrary app_library,
-      InterfaceRequest<mojom::Application> application_request) {
-    if (!RunNativeApplication(app_library, std::move(application_request))) {
+      InterfaceRequest<mojom::ShellClient> request) {
+    if (!RunNativeApplication(app_library, std::move(request))) {
       LOG(ERROR) << "Failure to RunNativeApplication()";
     }
   }
 
   base::ThreadChecker thread_checker_;
   base::NativeLibrary app_library_;
   Blocker::Unblocker unblocker_;
   StartAppCallback on_app_complete_;
 
   Binding<ChildController> binding_;
@@ skipping 110 matching lines @@
   // This will block, then run whatever the controller wants.
   blocker.Block();
 
   app_context.Shutdown();
 
   return 0;
 }
 
 }  // namespace shell
 }  // namespace mojo