[WONT COMMIT] ServiceWorker: Move unregister function from WebSWProvider to WebSWRegistration (2/3)

content/child/service_worker/web_service_worker_registration_impl.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 "content/child/service_worker/web_service_worker_registration_impl.h"
 
 #include "content/child/service_worker/service_worker_dispatcher.h"
 #include "content/child/service_worker/service_worker_registration_handle_reference.h"
 #include "content/child/service_worker/web_service_worker_impl.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerRegistrationProxy.h"
 
 namespace content {
 
 WebServiceWorkerRegistrationImpl::QueuedTask::QueuedTask(
     QueuedTaskType type,
     blink::WebServiceWorker* worker)
     : type(type),
       worker(worker) {
 }
 
 WebServiceWorkerRegistrationImpl::WebServiceWorkerRegistrationImpl(
+    int provider_id,
     scoped_ptr<ServiceWorkerRegistrationHandleReference> handle_ref)
-    : handle_ref_(handle_ref.Pass()),
+    : provider_id_(provider_id),
+      handle_ref_(handle_ref.Pass()),
       proxy_(NULL) {
   DCHECK(handle_ref_);
   DCHECK_NE(kInvalidServiceWorkerRegistrationHandleId,
             handle_ref_->handle_id());
   ServiceWorkerDispatcher* dispatcher =
       ServiceWorkerDispatcher::GetThreadSpecificInstance();
   DCHECK(dispatcher);
   dispatcher->AddServiceWorkerRegistration(handle_ref_->handle_id(), this);
 }
 
@@ skipping 70 matching lines @@
 
 blink::WebServiceWorkerRegistrationProxy*
 WebServiceWorkerRegistrationImpl::proxy() {
   return proxy_;
 }
 
 blink::WebURL WebServiceWorkerRegistrationImpl::scope() const {
   return handle_ref_->scope();
 }
 
+void WebServiceWorkerRegistrationImpl::unregister(
+    UnregisterCallbacks* callbacks) {
+  ServiceWorkerDispatcher* dispatcher =
+      ServiceWorkerDispatcher::GetThreadSpecificInstance();
+  DCHECK(dispatcher);
+  dispatcher->UnregisterServiceWorker(provider_id_, scope(), callbacks);

[kinuko, 2015/02/03 08:02:11]

If a registration outlives the document (and its provider) this will fail (and
causes crash)?

[nhiroki, 2015/02/03 12:59:37]

Good point. I understand that WebSWRegistration must not depend on the original
provider who created it. I'm now planning to make WebSWProvider available on
SWGlobalScope instead of this series of CLs...

+}
+
 int64 WebServiceWorkerRegistrationImpl::registration_id() const {
   return handle_ref_->registration_id();
 }
 
 }  // namespace content