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

mojo/shell/shell_application_loader.cc

Index: mojo/shell/shell_application_loader.cc
diff --git a/mojo/shell/shell_application_loader.cc b/mojo/shell/shell_application_loader.cc
index e648295cf9cc54d41c73c320eccd2bd36861b576..7b55a8dd11e33eff3a53829e73be55a4111d73b9 100644
--- a/mojo/shell/shell_application_loader.cc
+++ b/mojo/shell/shell_application_loader.cc
@@ -6,7 +6,7 @@
 
 #include <utility>
 
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/shell/shell_application_delegate.h"
 
 namespace mojo {
@@ -18,10 +18,10 @@ ShellApplicationLoader::~ShellApplicationLoader() {}
 
 void ShellApplicationLoader::Load(
     const GURL& url,
-    InterfaceRequest<mojom::Application> application_request) {
-  DCHECK(application_request.is_pending());
-  app_.reset(new ApplicationImpl(new ShellApplicationDelegate(manager_),
-                                 std::move(application_request)));
+    InterfaceRequest<mojom::ShellClient> request) {
+  DCHECK(request.is_pending());
+  shell_connection_.reset(new ShellConnection(
+      new ShellApplicationDelegate(manager_), std::move(request)));
 }
 
 }  // namespace shell