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

mojo/shell/runner/host/native_application_support.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/native_application_support.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 36 matching lines @@
 
   base::NativeLibraryLoadError error;
   base::NativeLibrary app_library = base::LoadNativeLibrary(app_path, &error);
   LOG_IF(ERROR, !app_library)
       << "Failed to load app library (error: " << error.ToString() << ")";
   return app_library;
 }
 
 bool RunNativeApplication(
     base::NativeLibrary app_library,
-    InterfaceRequest<mojom::Application> application_request) {
+    InterfaceRequest<mojom::ShellClient> request) {
   // Tolerate |app_library| being null, to make life easier for callers.
   if (!app_library)
     return false;
 
 // Thunks aren't needed/used in component build, since the thunked methods
 // just live in their own dynamically loaded library.
 #if !defined(COMPONENT_BUILD)
   if (!SetThunks(&MojoMakeSystemThunks, "MojoSetSystemThunks", app_library)) {
     LOG(ERROR) << "MojoSetSystemThunks not found";
     return false;
@@ skipping 45 matching lines @@
 #endif
 
   typedef MojoResult (*MojoMainFunction)(MojoHandle);
   MojoMainFunction main_function = reinterpret_cast<MojoMainFunction>(
       base::GetFunctionPointerFromNativeLibrary(app_library, "MojoMain"));
   if (!main_function) {
     LOG(ERROR) << "MojoMain not found";
     return false;
   }
   // |MojoMain()| takes ownership of the service handle.
-  MojoHandle handle = application_request.PassMessagePipe().release().value();
+  MojoHandle handle = request.PassMessagePipe().release().value();
   MojoResult result = main_function(handle);
   if (result != MOJO_RESULT_OK) {
     LOG(ERROR) << "MojoMain returned error (result: " << result << ")";
   }
   return true;
 }
 
 }  // namespace shell
 }  // namespace mojo