Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

components/html_viewer/html_document.h

 // 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.
 
 #ifndef COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
 
 #include <set>
 
 #include "base/callback.h"
@@ skipping 42 matching lines @@
       public HTMLFrameDelegate,
       public mojo::InterfaceFactory<mojo::AxProvider>,
       public mojo::InterfaceFactory<web_view::mojom::FrameClient>,
       public mojo::InterfaceFactory<TestHTMLViewer>,
       public mojo::InterfaceFactory<devtools_service::DevToolsAgent>,
       public mojo::InterfaceFactory<mus::mojom::WindowTreeClient> {
  public:
   using DeleteCallback = base::Callback<void(HTMLDocument*)>;
 
   // Load a new HTMLDocument with |response|.
-  // |html_document_app| is the application this app was created in, and
+  // |html_document_shell| is the application this app was created in, and
   // |connection| the specific connection triggering this new instance.
   // |setup| is used to obtain init type state (such as resources).
-  HTMLDocument(mojo::ApplicationImpl* html_document_app,
+  HTMLDocument(mojo::Shell* html_document_shell,
                mojo::ApplicationConnection* connection,
                mojo::URLResponsePtr response,
                GlobalState* setup,
                const DeleteCallback& delete_callback,
                HTMLFactory* factory);
 
   // Deletes this object.
   void Destroy();
 
  private:
@@ skipping 27 matching lines @@
 
   void Load();
 
   BeforeLoadCache* GetBeforeLoadCache();
 
   // WindowTreeDelegate:
   void OnEmbed(mus::Window* root) override;
   void OnConnectionLost(mus::WindowTreeConnection* connection) override;
 
   // HTMLFrameDelegate:
-  mojo::ApplicationImpl* GetApp() override;
+  mojo::Shell* GetShell() override;
   HTMLFactory* GetHTMLFactory() override;
   void OnFrameDidFinishLoad() override;
   void OnFrameSwappedToRemote() override;
   void OnSwap(HTMLFrame* frame, HTMLFrameDelegate* old_delegate) override;
   void OnFrameDestroyed() override;
 
   // mojo::InterfaceFactory<mojo::AxProvider>:
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojo::AxProvider> request) override;
 
@@ skipping 10 matching lines @@
   void Create(
       mojo::ApplicationConnection* connection,
       mojo::InterfaceRequest<devtools_service::DevToolsAgent> request) override;
 
   // mojo::InterfaceFactory<mus::WindowTreeClient>:
   void Create(
       mojo::ApplicationConnection* connection,
       mojo::InterfaceRequest<mus::mojom::WindowTreeClient> request) override;
 
   scoped_ptr<mojo::AppRefCount> app_refcount_;
-  mojo::ApplicationImpl* html_document_app_;
+  mojo::Shell* html_document_shell_;
   mojo::ApplicationConnection* connection_;
 
   // HTMLDocument owns these pointers; binding requests after document load.
   std::set<AxProviderImpl*> ax_providers_;
 
   ScopedVector<TestHTMLViewerImpl> test_html_viewers_;
 
   // Set to true when the local frame has finished loading.
   bool did_finish_local_frame_load_ = false;
 
@@ skipping 15 matching lines @@
   // initialized.
   mojo::InterfaceRequest<devtools_service::DevToolsAgent>
       devtools_agent_request_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLDocument);
 };
 
 }  // namespace html_viewer
 
 #endif  // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_