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

components/html_viewer/html_viewer.h

Index: components/html_viewer/html_viewer.h
diff --git a/components/html_viewer/html_viewer.h b/components/html_viewer/html_viewer.h
index 6543bf374424280a5b5092d8ae0a7c15d9ef1c99..83597c1b134bd22e8974b37e31522735d87bab24 100644
--- a/components/html_viewer/html_viewer.h
+++ b/components/html_viewer/html_viewer.h
@@ -8,7 +8,7 @@
 #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 {
@@ -24,10 +24,11 @@ class HTMLViewer
 
  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:
@@ -40,7 +41,7 @@ class HTMLViewer
                   request) override;
 
   scoped_ptr<GlobalState> global_state_;
-  mojo::ApplicationImpl* app_;
+  mojo::Shell* shell_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLViewer);
 };