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

components/html_viewer/html_document_application_delegate.cc

 // Copyright 2015 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_application_delegate.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 75 matching lines @@
 
 // Callback from the quit closure. We key off this rather than
 // ApplicationDelegate::Quit() as we don't want to shut down the messageloop
 // when we quit (the messageloop is shared among multiple
 // HTMLDocumentApplicationDelegates).
 void HTMLDocumentApplicationDelegate::OnTerminate() {
   delete this;
 }
 
 // ApplicationDelegate;
-void HTMLDocumentApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
+void HTMLDocumentApplicationDelegate::Initialize(mojo::Shell* shell,
+                                                 const std::string& url,
+                                                 uint32_t id) {
   app_.ConnectToService("mojo:network_service", &url_loader_factory_);
 }
 
 bool HTMLDocumentApplicationDelegate::AcceptConnection(
     mojo::ApplicationConnection* connection) {
   if (initial_response_) {
     OnResponseReceived(nullptr, mojo::URLLoaderPtr(), connection, nullptr,
                        std::move(initial_response_));
   } else if (url_ == "about:blank") {
     // This is a little unfortunate. At the browser side, when starting a new
@@ skipping 21 matching lines @@
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = url_;
     request->auto_follow_redirects = true;
 
     // |loader| will be passed to the OnResponseReceived method through a
     // callback. Because order of evaluation is undefined, a reference to the
     // raw pointer is needed.
     mojo::URLLoader* raw_loader = loader.get();
     // The app needs to stay alive while waiting for the response to be
     // available.
-    scoped_ptr<mojo::AppRefCount> app_retainer(
-        app_.app_lifetime_helper()->CreateAppRefCount());
+    scoped_ptr<mojo::AppRefCount> app_retainer(app_.CreateAppRefCount());
     raw_loader->Start(
         std::move(request),
         base::Bind(&HTMLDocumentApplicationDelegate::OnResponseReceived,
                    weak_factory_.GetWeakPtr(), base::Passed(&app_retainer),
                    base::Passed(&loader), connection,
                    base::Passed(&service_connector_queue)));
   }
   return true;
 }
 
@@ skipping 28 matching lines @@
     HTMLFrame::CreateParams* params) {
   return new HTMLFrame(params);
 }
 
 HTMLWidgetRootLocal* HTMLDocumentApplicationDelegate::CreateHTMLWidgetRootLocal(
     HTMLWidgetRootLocal::CreateParams* params) {
   return new HTMLWidgetRootLocal(params);
 }
 
 }  // namespace html_viewer