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

mojo/shell/runner/host/in_process_native_runner.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/in_process_native_runner.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 17 matching lines @@
   if (thread_) {
     DCHECK(thread_->HasBeenStarted());
     DCHECK(!thread_->HasBeenJoined());
     thread_->Join();
   }
 }
 
 void InProcessNativeRunner::Start(
     const base::FilePath& app_path,
     bool start_sandboxed,
-    InterfaceRequest<mojom::Application> application_request,
+    InterfaceRequest<mojom::ShellClient> request,
     const base::Callback<void(base::ProcessId)>& pid_available_callback,
     const base::Closure& app_completed_callback) {
   app_path_ = app_path;
 
-  DCHECK(!application_request_.is_pending());
-  application_request_ = std::move(application_request);
+  DCHECK(!request_.is_pending());
+  request_ = std::move(request);
 
   DCHECK(app_completed_callback_runner_.is_null());
   app_completed_callback_runner_ = base::Bind(
       &base::TaskRunner::PostTask, base::ThreadTaskRunnerHandle::Get(),
       FROM_HERE, app_completed_callback);
 
   DCHECK(!thread_);
   thread_.reset(new base::DelegateSimpleThread(this, "app_thread"));
   thread_->Start();
   pid_available_callback.Run(base::kNullProcessId);
 }
 
 void InProcessNativeRunner::InitHost(
     ScopedHandle channel,
-    InterfaceRequest<mojom::Application> application_request) {
+    InterfaceRequest<mojom::ShellClient> request) {
   NOTREACHED();  // Can't host another process in this runner.
 }
 
 void InProcessNativeRunner::Run() {
   DVLOG(2) << "Loading/running Mojo app in process from library: "
            << app_path_.value()
            << " thread id=" << base::PlatformThread::CurrentId();
 
   // TODO(vtl): ScopedNativeLibrary doesn't have a .get() method!
   base::NativeLibrary app_library = LoadNativeApplication(app_path_);
   app_library_.Reset(app_library);
   // This hangs on Windows in the component build, so skip it since it's
   // unnecessary.
 #if !(defined(COMPONENT_BUILD) && defined(OS_WIN))
   CallLibraryEarlyInitialization(app_library);
 #endif
-  RunNativeApplication(app_library, std::move(application_request_));
+  RunNativeApplication(app_library, std::move(request_));
   app_completed_callback_runner_.Run();
   app_completed_callback_runner_.Reset();
 }
 
 scoped_ptr<NativeRunner> InProcessNativeRunnerFactory::Create(
     const base::FilePath& app_path) {
   // Non-Mojo apps are always run in a new process.
   if (!app_path.MatchesExtension(FILE_PATH_LITERAL(".mojo"))) {
     return make_scoped_ptr(
         new OutOfProcessNativeRunner(launch_process_runner_));
   }
   return make_scoped_ptr(new InProcessNativeRunner);
 }
 
 }  // namespace shell
 }  // namespace mojo