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

components/pdf_viewer/pdf_viewer.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 <stddef.h>
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 36 matching lines @@
 
 // Responsible for managing a particlar view displaying a PDF document.
 class PDFView : public mus::WindowTreeDelegate,
                 public mus::WindowObserver,
                 public mus::InputEventHandler,
                 public web_view::mojom::FrameClient,
                 public mojo::InterfaceFactory<web_view::mojom::FrameClient> {
  public:
   using DeleteCallback = base::Callback<void(PDFView*)>;
 
-  PDFView(mojo::ApplicationImpl* app,
+  PDFView(mojo::Shell* shell,
           mojo::ApplicationConnection* connection,
           FPDF_DOCUMENT doc,
           const DeleteCallback& delete_callback)
-      : app_ref_(app->app_lifetime_helper()->CreateAppRefCount()),
+      : app_ref_(shell->CreateAppRefCount()),
         doc_(doc),
         current_page_(0),
         page_count_(FPDF_GetPageCount(doc_)),
-        shell_(app->shell()),
+        shell_(shell),
         root_(nullptr),
         frame_client_binding_(this),
         delete_callback_(delete_callback) {
     connection->AddService(this);
   }
 
   void Close() {
     if (root_)
       mus::ScopedWindowPtr::DeleteWindowOrWindowManager(root_);
     else
@@ skipping 145 matching lines @@
     frame_client_binding_.Bind(std::move(request));
   }
 
   scoped_ptr<mojo::AppRefCount> app_ref_;
   FPDF_DOCUMENT doc_;
   int current_page_;
   int page_count_;
 
   scoped_ptr<bitmap_uploader::BitmapUploader> bitmap_uploader_;
 
-  mojo::shell::mojom::Shell* shell_;
+  mojo::Shell* shell_;
   mus::Window* root_;
 
   web_view::mojom::FramePtr frame_;
   mojo::Binding<web_view::mojom::FrameClient> frame_client_binding_;
   DeleteCallback delete_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PDFView);
 };
 
 // Responsible for managing all the views for displaying a PDF document.
@@ skipping 104 matching lines @@
  public:
   PDFViewer() {
     v8::V8::InitializeICU();
     FPDF_InitLibrary();
   }
 
   ~PDFViewer() override { FPDF_DestroyLibrary(); }
 
  private:
   // ApplicationDelegate:
-  void Initialize(mojo::ApplicationImpl* app) override {
-    tracing_.Initialize(app);
+  void Initialize(mojo::Shell* shell, const std::string& url,
+                  uint32_t id) override {
+    tracing_.Initialize(shell, url);
   }
 
   bool AcceptConnection(
       mojo::ApplicationConnection* connection) override {
     connection->AddService(this);
     return true;
   }
 
   // InterfaceFactory<ContentHandler>:
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojo::shell::mojom::ContentHandler>
                   request) override {
     new ContentHandlerImpl(std::move(request));
   }
 
   mojo::TracingImpl tracing_;
 
   DISALLOW_COPY_AND_ASSIGN(PDFViewer);
 };
 }  // namespace
 }  // namespace pdf_viewer
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunner runner(new pdf_viewer::PDFViewer());
   return runner.Run(application_request);
 }