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

mojo/shell/native_runner.h

Index: mojo/shell/native_runner.h
diff --git a/mojo/shell/native_runner.h b/mojo/shell/native_runner.h
index ea99a75b03d165f5d818520844fee274093c5f25..6ab587b4f449f3b84f1672434d40e3e1e9ae0c43 100644
--- a/mojo/shell/native_runner.h
+++ b/mojo/shell/native_runner.h
@@ -9,7 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process_handle.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/shell/public/interfaces/application.mojom.h"
+#include "mojo/shell/public/interfaces/shell_client.mojom.h"
 
 #if defined(OS_WIN)
 #undef DELETE
@@ -33,15 +33,14 @@ class NativeRunner {
   virtual void 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) = 0;
 
   // Like Start(), but used to initialize the host for a child process started
-  // by someone else. Provides |application_request| via |channel|.
-  virtual void InitHost(
-      ScopedHandle channel,
-    InterfaceRequest<mojom::Application> application_request) = 0;
+  // by someone else. Provides |request| via |channel|.
+  virtual void InitHost(ScopedHandle channel,
+                        InterfaceRequest<mojom::ShellClient> request) = 0;
 };
 
 class NativeRunnerFactory {