mojo: Fix html_viewer.

mojo/services/html_viewer/html_document_view.cc

 // Copyright 2014 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.
 
 #include "mojo/services/html_viewer/html_document_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 71 matching lines @@
   return false;
 }
 
 }  // namespace
 
 HTMLDocumentView::HTMLDocumentView(
     URLResponsePtr response,
     ShellPtr shell,
     scoped_refptr<base::MessageLoopProxy> compositor_thread,
     WebMediaPlayerFactory* web_media_player_factory)
-    : shell_(shell.Pass()),
+    : response_(response.Pass()),
+      shell_(shell.Pass()),
       web_view_(NULL),
       root_(NULL),
       view_manager_client_factory_(shell_.get(), this),
       compositor_thread_(compositor_thread),
       web_media_player_factory_(web_media_player_factory),
       weak_factory_(this) {
-  Load(response.Pass());
+  shell_.set_client(this);
 }
 
 HTMLDocumentView::~HTMLDocumentView() {
   if (web_view_)
     web_view_->close();
   if (root_)
     root_->RemoveObserver(this);
 }
 
 void HTMLDocumentView::AcceptConnection(const String& requestor_url,
                                         ServiceProviderPtr provider) {
   exported_services_.AddService(&view_manager_client_factory_);
   WeakBindToPipe(&exported_services_, provider.PassMessagePipe());
+  Load(response_.Pass());
 }
 
 void HTMLDocumentView::Initialize(Array<String> args) {
 }
 
 void HTMLDocumentView::OnEmbed(
     ViewManager* view_manager,
     View* root,
     ServiceProviderImpl* embedee_service_provider_impl,
     scoped_ptr<ServiceProvider> embedder_service_provider) {
@@ skipping 136 matching lines @@
 }
 
 void HTMLDocumentView::OnViewInputEvent(View* view, const EventPtr& event) {
   scoped_ptr<blink::WebInputEvent> web_event =
       event.To<scoped_ptr<blink::WebInputEvent> >();
   if (web_event)
     web_view_->handleInputEvent(*web_event);
 }
 
 }  // namespace mojo