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

mandoline/ui/phone_ui/phone_browser_application_delegate.h

 // 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.
 
 #ifndef MANDOLINE_UI_PHONE_UI_PHONE_BROWSER_APPLICATION_DELEGATE_H_
 #define MANDOLINE_UI_PHONE_UI_PHONE_BROWSER_APPLICATION_DELEGATE_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 21 matching lines @@
       public mus::WindowTreeDelegate,
       public mus::WindowObserver,
       public web_view::mojom::WebViewClient,
       public mojo::InterfaceFactory<LaunchHandler> {
  public:
   PhoneBrowserApplicationDelegate();
   ~PhoneBrowserApplicationDelegate() override;
 
  private:
   // Overridden from mojo::ApplicationDelegate:
-  void Initialize(mojo::ApplicationImpl* app) override;
+  void Initialize(mojo::Shell* shell, const std::string& url,
+                  uint32_t id) override;
   bool AcceptConnection(
       mojo::ApplicationConnection* connection) override;
 
   // Overridden from LaunchHandler:
   void LaunchURL(const mojo::String& url) override;
 
   // Overridden from mus::WindowTreeDelegate:
   void OnEmbed(mus::Window* root) override;
   void OnConnectionLost(mus::WindowTreeConnection* connection) override;
 
@@ skipping 12 matching lines @@
   void FindInPageMatchCountUpdated(int32_t request_id,
                                    int32_t count,
                                    bool final_update) override {}
   void FindInPageSelectionUpdated(int32_t request_id,
                                   int32_t active_match_ordinal) override {}
 
   // Overridden from mojo::InterfaceFactory<LaunchHandler>:
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<LaunchHandler> request) override;
 
-  mojo::ApplicationImpl* app_;
+  mojo::Shell* shell_;
   mus::mojom::WindowTreeHostPtr host_;
 
   mus::Window* root_;
   mus::Window* content_;
   web_view::WebView web_view_;
 
   mojo::String default_url_;
 
   mojo::WeakBindingSet<LaunchHandler> launch_handler_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(PhoneBrowserApplicationDelegate);
 };
 
 }  // namespace mandoline
 
 #endif  // MANDOLINE_UI_PHONE_UI_PHONE_BROWSER_APPLICATION_DELEGATE_H_