Fix html viewer.

mojo/services/html_viewer/html_document_view.h

Index: mojo/services/html_viewer/html_document_view.h
diff --git a/mojo/services/html_viewer/html_document_view.h b/mojo/services/html_viewer/html_document_view.h
index d1cd1eb5c116b3c9c271a3fabbcdc0fefc517b3e..65da22aedaf9aa8d669c84a718eb2d0cb8243d19 100644
--- a/mojo/services/html_viewer/html_document_view.h
+++ b/mojo/services/html_viewer/html_document_view.h
@@ -7,6 +7,7 @@
 
 #include <set>
 
+#include "base/callback.h"
 #include "base/macros.h"
 #include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/public/cpp/application/lazy_interface_ptr.h"
@@ -36,8 +37,7 @@ class View;
 class WebLayerTreeViewImpl;
 
 // A view for a single HTML document.
-class HTMLDocumentView : public mojo::InterfaceImpl<mojo::Application>,
-                         public blink::WebViewClient,
+class HTMLDocumentView : public blink::WebViewClient,
                          public blink::WebFrameClient,
                          public ViewManagerDelegate,
                          public ViewObserver,
@@ -51,18 +51,15 @@ class HTMLDocumentView : public mojo::InterfaceImpl<mojo::Application>,
   // request ViewManagerClient.
   //
   // |shell| is the Shell connection for this mojo::Application.
-  HTMLDocumentView(URLResponsePtr response,
-                   ShellPtr shell,
+  HTMLDocumentView(const base::Closure& destruction_callback,
+                   ServiceProviderPtr provider,
+                   URLResponsePtr response,
+                   Shell* shell,
                    scoped_refptr<base::MessageLoopProxy> compositor_thread,
                    WebMediaPlayerFactory* web_media_player_factory);
   virtual ~HTMLDocumentView();
 
  private:
-  // Application methods:
-  void AcceptConnection(const String& requestor_url,
-                        ServiceProviderPtr provider) override;
-  void Initialize(Array<String> args) override;
-
   // WebViewClient methods:
   virtual blink::WebStorageNamespace* createSessionStorageNamespace();
 
@@ -118,10 +115,11 @@ class HTMLDocumentView : public mojo::InterfaceImpl<mojo::Application>,
 
   void Load(URLResponsePtr response);
 
+  base::Closure destruction_callback_;
   URLResponsePtr response_;
   ServiceProviderImpl exported_services_;
   scoped_ptr<ServiceProvider> embedder_service_provider_;
-  ShellPtr shell_;
+  Shell* shell_;
   LazyInterfacePtr<NavigatorHost> navigator_host_;
   blink::WebView* web_view_;
   View* root_;