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

components/html_viewer/html_viewer.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_HTML_VIEWER_H_
 #define COMPONENTS_HTML_VIEWER_HTML_VIEWER_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/shell/public/cpp/application_delegate.h"
-#include "mojo/shell/public/cpp/interface_factory_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 #include "mojo/shell/public/interfaces/content_handler.mojom.h"
 
 namespace html_viewer {
 
 class GlobalState;
 
 class HTMLViewer
     : public mojo::ApplicationDelegate,
       public mojo::InterfaceFactory<mojo::shell::mojom::ContentHandler> {
  public:
   HTMLViewer();
   ~HTMLViewer() override;
 
  protected:
   GlobalState* global_state() const { return global_state_.get(); }
-  mojo::ApplicationImpl* app() const { return app_; }
+  mojo::Shell* shell() const { return shell_; }
 
   // Overridden from ApplicationDelegate:
-  void Initialize(mojo::ApplicationImpl* app) override;
+  void Initialize(mojo::Shell* shell, const std::string& url,
+                  uint32_t id) override;
 
  private:
   // Overridden from ApplicationDelegate:
   bool AcceptConnection(
       mojo::ApplicationConnection* connection) override;
 
   // Overridden from InterfaceFactory<shell::mojom::ContentHandler>
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojo::shell::mojom::ContentHandler>
                   request) override;
 
   scoped_ptr<GlobalState> global_state_;
-  mojo::ApplicationImpl* app_;
+  mojo::Shell* shell_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLViewer);
 };
 
 }  // namespace html_viewer
 
 #endif  // COMPONENTS_HTML_VIEWER_HTML_VIEWER_H_