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

components/html_viewer/content_handler_impl.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 COMPONENTS_HTML_VIEWER_CONTENT_HANDLER_IMPL_H_
 #define COMPONENTS_HTML_VIEWER_CONTENT_HANDLER_IMPL_H_
 
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "mojo/shell/public/interfaces/content_handler.mojom.h"
 
 namespace html_viewer {
 
 class GlobalState;
 
 class ContentHandlerImpl : public mojo::shell::mojom::ContentHandler {
  public:
   ContentHandlerImpl(
       GlobalState* global_state,
-      mojo::ApplicationImpl* app,
+      mojo::Shell* shell,
       mojo::InterfaceRequest<mojo::shell::mojom::ContentHandler> request);
   ~ContentHandlerImpl() override;
 
  protected:
   GlobalState* global_state() const { return global_state_; }
-  mojo::ApplicationImpl* app() const { return app_; }
+  mojo::Shell* shell() const { return shell_; }
 
  private:
   // Overridden from shell::mojom::ContentHandler:
   void StartApplication(
       mojo::ApplicationRequest request,
       mojo::URLResponsePtr response,
       const mojo::Callback<void()>& destruct_callback) override;
 
   GlobalState* global_state_;
-  mojo::ApplicationImpl* app_;
+  mojo::Shell* shell_;
   mojo::StrongBinding<mojo::shell::mojom::ContentHandler> binding_;
   scoped_ptr<mojo::AppRefCount> app_refcount_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentHandlerImpl);
 };
 
 }  // namespace html_viewer
 
 #endif  // COMPONENTS_HTML_VIEWER_CONTENT_HANDLER_IMPL_H_