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

components/html_viewer/html_document.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 "components/html_viewer/html_document.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 76 matching lines @@
 
 void HTMLDocument::TransferableState::Move(TransferableState* other) {
   owns_window_tree_connection = other->owns_window_tree_connection;
   root = other->root;
   window_tree_delegate_impl = std::move(other->window_tree_delegate_impl);
 
   other->root = nullptr;
   other->owns_window_tree_connection = false;
 }
 
-HTMLDocument::HTMLDocument(mojo::ApplicationImpl* html_document_app,
+HTMLDocument::HTMLDocument(mojo::Shell* html_document_shell,
                            mojo::ApplicationConnection* connection,
                            mojo::URLResponsePtr response,
                            GlobalState* global_state,
                            const DeleteCallback& delete_callback,
                            HTMLFactory* factory)
-    : app_refcount_(html_document_app->app_lifetime_helper()
-                        ->CreateAppRefCount()),
-      html_document_app_(html_document_app),
+    : app_refcount_(html_document_shell->CreateAppRefCount()),
+      html_document_shell_(html_document_shell),
       connection_(connection),
       global_state_(global_state),
       frame_(nullptr),
       delete_callback_(delete_callback),
       factory_(factory) {
   connection->AddService<web_view::mojom::FrameClient>(this);
   connection->AddService<AxProvider>(this);
   connection->AddService<mus::mojom::WindowTreeClient>(this);
   connection->AddService<devtools_service::DevToolsAgent>(this);
   if (IsTestInterfaceEnabled())
@@ skipping 108 matching lines @@
     ax_providers_.insert(new AxProviderImpl(
         frame_->frame_tree_manager()->GetWebView(), std::move(*it)));
   }
   for (auto it : before_load_cache->test_interface_requests) {
     CHECK(IsTestInterfaceEnabled());
     test_html_viewers_.push_back(new TestHTMLViewerImpl(
         frame_->web_frame()->toWebLocalFrame(), std::move(*it)));
   }
 }
 
-mojo::ApplicationImpl* HTMLDocument::GetApp() {
-  return html_document_app_;
+mojo::Shell* HTMLDocument::GetShell() {
+  return html_document_shell_;
 }
 
 HTMLFactory* HTMLDocument::GetHTMLFactory() {
   return factory_;
 }
 
 void HTMLDocument::OnFrameSwappedToRemote() {
   // When the frame becomes remote HTMLDocument is no longer needed.
   frame_ = nullptr;
   Destroy();
@@ skipping 79 matching lines @@
   DCHECK(!transferable_state_.window_tree_delegate_impl);
   transferable_state_.window_tree_delegate_impl.reset(
       new WindowTreeDelegateImpl(this));
   transferable_state_.owns_window_tree_connection = true;
   mus::WindowTreeConnection::Create(
       transferable_state_.window_tree_delegate_impl.get(), std::move(request),
       mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
 }
 
 }  // namespace html_viewer