Make sure that Content Handled application can be connected multiple times.

sky/viewer/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 "sky/viewer/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 54 matching lines @@
     default:
       return mojo::TARGET_DEFAULT;
   }
 }
 
 }  // namespace
 
 static int s_next_debugger_id = 1;
 
 DocumentView::DocumentView(
+    const base::Closure& destruction_callback,
+    mojo::ServiceProviderPtr provider,
     mojo::URLResponsePtr response,
-    mojo::ShellPtr shell,
+    mojo::Shell* shell,
     scoped_refptr<base::MessageLoopProxy> compositor_thread)
-    : response_(response.Pass()),
-      shell_(shell.Pass()),
+    : destruction_callback_(destruction_callback),
+      response_(response.Pass()),
+      shell_(shell),
       web_view_(NULL),
       root_(NULL),
-      view_manager_client_factory_(shell_.get(), this),
+      view_manager_client_factory_(shell_, this),
       inspector_service_factory_(this),
       compositor_thread_(compositor_thread),
       debugger_id_(s_next_debugger_id++),
       weak_factory_(this) {
-  shell_.set_client(this);
+  exported_services_.AddService(&view_manager_client_factory_);
+  mojo::WeakBindToPipe(&exported_services_, provider.PassMessagePipe());
 }
 
 DocumentView::~DocumentView() {
   if (web_view_)
     web_view_->close();
   if (root_)
     root_->RemoveObserver(this);
+  destruction_callback_.Run();
 }
 
 base::WeakPtr<DocumentView> DocumentView::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
-void DocumentView::AcceptConnection(const mojo::String& requestor_url,
-                                    mojo::ServiceProviderPtr provider) {
-  exported_services_.AddService(&view_manager_client_factory_);
-  mojo::WeakBindToPipe(&exported_services_, provider.PassMessagePipe());
-}
-
-void DocumentView::Initialize(mojo::Array<mojo::String> args) {
-}
-
 void DocumentView::OnEmbed(
     mojo::ViewManager* view_manager,
     mojo::View* root,
     mojo::ServiceProviderImpl* exported_services,
     scoped_ptr<mojo::ServiceProvider> imported_services) {
 
   root_ = root;
   imported_services_ = imported_services.Pass();
   navigator_host_.set_service_provider(imported_services_.get());
   exported_services->AddService(&inspector_service_factory_);
@@ skipping 140 matching lines @@
 
 blink::ServiceProvider& DocumentView::services() {
   return *this;
 }
 
 mojo::NavigatorHost* DocumentView::NavigatorHost() {
   return navigator_host_.get();
 }
 
 mojo::Shell* DocumentView::Shell() {
-  return shell_.get();
+  return shell_;
 }
 
 void DocumentView::OnViewBoundsChanged(mojo::View* view,
                                        const mojo::Rect& old_bounds,
                                        const mojo::Rect& new_bounds) {
   DCHECK_EQ(view, root_);
   gfx::Size size = new_bounds.To<gfx::Rect>().size();
   web_view_->resize(size);
 #if !ENABLE_SKY_COMPOSITOR
   web_layer_tree_view_impl_->setViewportSize(size);
@@ skipping 36 matching lines @@
     return web_view_->mainFrame()->mainWorldScriptContext();
   }
 
  private:
   blink::WebView* web_view_;
   mojo::Shell* shell_;
 };
 
 void DocumentView::StartDebuggerInspectorBackend() {
   if (!inspector_backend_) {
-    inspector_host_.reset(new InspectorHostImpl(web_view_, shell_.get()));
+    inspector_host_.reset(new InspectorHostImpl(web_view_, shell_));
     inspector_backend_.reset(
         new inspector::InspectorBackendMojo(inspector_host_.get()));
   }
   inspector_backend_->Connect();
 }
 
 }  // namespace sky