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

components/html_viewer/html_document_application_delegate.h

Index: components/html_viewer/html_document_application_delegate.h
diff --git a/components/html_viewer/html_document_application_delegate.h b/components/html_viewer/html_document_application_delegate.h
index 88700211d8da7d94a8d8f25f744d543d275df19d..da9b5b7ea4bc781702f168ce19f56d8ed664f187 100644
--- a/components/html_viewer/html_document_application_delegate.h
+++ b/components/html_viewer/html_document_application_delegate.h
@@ -13,9 +13,9 @@
 #include "components/html_viewer/html_factory.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/shell.h"
 #include "mojo/shell/public/cpp/shell_client.h"
+#include "mojo/shell/public/cpp/shell_connection.h"
 
 namespace html_viewer {
 
@@ -27,7 +27,7 @@ class HTMLDocumentApplicationDelegate : public mojo::ShellClient,
                                         public HTMLFactory {
  public:
   HTMLDocumentApplicationDelegate(
-      mojo::ApplicationRequest request,
+      mojo::ShellClientRequest request,
       mojo::URLResponsePtr response,
       GlobalState* global_state,
       scoped_ptr<mojo::AppRefCount> parent_app_refcount,
@@ -64,7 +64,7 @@ class HTMLDocumentApplicationDelegate : public mojo::ShellClient,
   HTMLWidgetRootLocal* CreateHTMLWidgetRootLocal(
       HTMLWidgetRootLocal::CreateParams* params) override;
 
-  mojo::ApplicationImpl app_;
+  mojo::ShellConnection app_;
   // AppRefCount of the parent (HTMLViewer).
   scoped_ptr<mojo::AppRefCount> parent_app_refcount_;
   const mojo::String url_;