Make ServiceWorkerDispatcher reuse existing WebServiceWorkerImpls.

content/child/service_worker/web_service_worker_impl.cc

 // Copyright 2013 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 "content/child/service_worker/web_service_worker_impl.h"
 
 #include "content/child/service_worker/service_worker_dispatcher.h"
 #include "content/child/service_worker/service_worker_handle_reference.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/service_worker/service_worker_messages.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerProxy.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
 using blink::WebMessagePortChannel;
 using blink::WebMessagePortChannelArray;
 using blink::WebMessagePortChannelClient;
 using blink::WebString;
 
 namespace content {
 
 WebServiceWorkerImpl::WebServiceWorkerImpl(
-    const ServiceWorkerObjectInfo& info,
-    ThreadSafeSender* thread_safe_sender)
-    : handle_ref_(
-          ServiceWorkerHandleReference::CreateForDeleter(info,
-                                                         thread_safe_sender)),
-      state_(handle_ref_->state()),
-      thread_safe_sender_(thread_safe_sender),
-      proxy_(NULL) {
-  ServiceWorkerDispatcher* dispatcher =
-      ServiceWorkerDispatcher::GetThreadSpecificInstance();
-  DCHECK(dispatcher);
-  dispatcher->AddServiceWorker(handle_ref_->handle_id(), this);
-}
-
-WebServiceWorkerImpl::WebServiceWorkerImpl(
     scoped_ptr<ServiceWorkerHandleReference> handle_ref,
     ThreadSafeSender* thread_safe_sender)
     : handle_ref_(handle_ref.Pass()),
       state_(handle_ref_->state()),
       thread_safe_sender_(thread_safe_sender),
       proxy_(NULL) {
   ServiceWorkerDispatcher* dispatcher =
       ServiceWorkerDispatcher::GetThreadSpecificInstance();
   DCHECK(dispatcher);
   dispatcher->AddServiceWorker(handle_ref_->handle_id(), this);
@@ skipping 14 matching lines @@
   if (proxy_->isReady())
     ChangeState(new_state);
   else
     queued_states_.push_back(new_state);
 }
 
 void WebServiceWorkerImpl::setProxy(blink::WebServiceWorkerProxy* proxy) {
   proxy_ = proxy;
 }
 
+blink::WebServiceWorkerProxy* WebServiceWorkerImpl::proxy() {
+  return proxy_;
+}
+
 void WebServiceWorkerImpl::proxyReadyChanged() {
   if (!proxy_->isReady())
     return;
   for (std::vector<blink::WebServiceWorkerState>::iterator it =
            queued_states_.begin();
        it != queued_states_.end();
        ++it) {
     ChangeState(*it);
   }
   queued_states_.clear();
@@ skipping 20 matching lines @@
 }
 
 void WebServiceWorkerImpl::ChangeState(blink::WebServiceWorkerState new_state) {
   DCHECK(proxy_);
   DCHECK(proxy_->isReady());
   state_ = new_state;
   proxy_->dispatchStateChangeEvent();
 }
 
 }  // namespace content