Update html_viewer to follow to content handle API change.

mojo/services/html_viewer/html_viewer.cc

Index: mojo/services/html_viewer/html_viewer.cc
diff --git a/mojo/services/html_viewer/html_viewer.cc b/mojo/services/html_viewer/html_viewer.cc
index dc56ddca963ae907e27e874e8886531b2db006ab..cb9e9d1450e7c7859aa4f394a1f5d234946d7c9f 100644
--- a/mojo/services/html_viewer/html_viewer.cc
+++ b/mojo/services/html_viewer/html_viewer.cc
@@ -37,28 +37,19 @@ class HTMLViewer;
 
 class ContentHandlerImpl : public InterfaceImpl<ContentHandler> {
  public:
-  ContentHandlerImpl(Shell* shell,
-                     scoped_refptr<base::MessageLoopProxy> compositor_thread,
+  ContentHandlerImpl(scoped_refptr<base::MessageLoopProxy> compositor_thread,
                      WebMediaPlayerFactory* web_media_player_factory)
-      : shell_(shell),
-        compositor_thread_(compositor_thread),
+      : compositor_thread_(compositor_thread),
         web_media_player_factory_(web_media_player_factory) {}
   ~ContentHandlerImpl() override {}
 
  private:
   // Overridden from ContentHandler:
-  void OnConnect(
-      const mojo::String& requestor_url,
-      URLResponsePtr response,
-      InterfaceRequest<ServiceProvider> service_provider_request) override {
-    new HTMLDocumentView(response.Pass(),
-                         service_provider_request.Pass(),
-                         shell_,
-                         compositor_thread_,
+  void StartApplication(ShellPtr shell, URLResponsePtr response) override {
+    new HTMLDocumentView(response.Pass(), shell.Pass(), compositor_thread_,

[jamesr, 2014/10/31 18:10:19]

very odd wrapping here

                          web_media_player_factory_);
   }
 
-  Shell* shell_;
   scoped_refptr<base::MessageLoopProxy> compositor_thread_;
   WebMediaPlayerFactory* web_media_player_factory_;
 
@@ -75,7 +66,6 @@ class HTMLViewer : public ApplicationDelegate,
  private:
   // Overridden from ApplicationDelegate:
   void Initialize(ApplicationImpl* app) override {
-    shell_ = app->shell();
     blink_platform_impl_.reset(new BlinkPlatformImpl(app));
     blink::initialize(blink_platform_impl_.get());
 #if !defined(COMPONENT_BUILD)
@@ -110,7 +100,7 @@ class HTMLViewer : public ApplicationDelegate,
   void Create(ApplicationConnection* connection,
               InterfaceRequest<ContentHandler> request) override {
     BindToRequest(
-        new ContentHandlerImpl(shell_, compositor_thread_.message_loop_proxy(),
+        new ContentHandlerImpl(compositor_thread_.message_loop_proxy(),
                                web_media_player_factory_.get()),
         &request);
   }