ServiceWorker: Change the return value of ServiceWorkerRegistration::unregister to boolean (2/4)

content/child/service_worker/service_worker_dispatcher.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/service_worker_dispatcher.h"
 
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
 #include "content/child/child_thread.h"
@@ skipping 74 matching lines @@
   if (pattern.possibly_invalid_spec().size() > GetMaxURLChars() ||
       script_url.possibly_invalid_spec().size() > GetMaxURLChars()) {
     scoped_ptr<WebServiceWorkerRegistrationCallbacks>
         owned_callbacks(callbacks);
     scoped_ptr<WebServiceWorkerError> error(new WebServiceWorkerError(
         WebServiceWorkerError::ErrorTypeSecurity, "URL too long"));
     callbacks->onError(error.release());
     return;
   }
 
-  int request_id = pending_callbacks_.Add(callbacks);
+  int request_id = pending_registration_callbacks_.Add(callbacks);
   thread_safe_sender_->Send(new ServiceWorkerHostMsg_RegisterServiceWorker(
       CurrentWorkerId(), request_id, provider_id, pattern, script_url));
 }
 
 void ServiceWorkerDispatcher::UnregisterServiceWorker(
     int provider_id,
     const GURL& pattern,
-    WebServiceWorkerRegistrationCallbacks* callbacks) {
+    WebServiceWorkerUnregistrationCallbacks* callbacks) {
   DCHECK(callbacks);
 
   if (pattern.possibly_invalid_spec().size() > GetMaxURLChars()) {
-    scoped_ptr<WebServiceWorkerRegistrationCallbacks>
+    scoped_ptr<WebServiceWorkerUnregistrationCallbacks>
         owned_callbacks(callbacks);
     scoped_ptr<WebServiceWorkerError> error(new WebServiceWorkerError(
         WebServiceWorkerError::ErrorTypeSecurity, "URL too long"));
     callbacks->onError(error.release());
     return;
   }
 
-  int request_id = pending_callbacks_.Add(callbacks);
+  int request_id = pending_unregistration_callbacks_.Add(callbacks);
   thread_safe_sender_->Send(new ServiceWorkerHostMsg_UnregisterServiceWorker(
       CurrentWorkerId(), request_id, provider_id, pattern));
 }
 
 void ServiceWorkerDispatcher::AddProviderContext(
     ServiceWorkerProviderContext* provider_context) {
   DCHECK(provider_context);
   int provider_id = provider_context->provider_id();
   DCHECK(!ContainsKey(provider_contexts_, provider_id));
   provider_contexts_[provider_id] = provider_context;
@@ skipping 107 matching lines @@
   // WebServiceWorkerRegistrationImpl constructor calls
   // AddServiceWorkerRegistration.
   return new WebServiceWorkerRegistrationImpl(handle_ref.Pass());
 }
 
 void ServiceWorkerDispatcher::OnRegistered(
     int thread_id,
     int request_id,
     const ServiceWorkerRegistrationObjectInfo& info) {
   WebServiceWorkerRegistrationCallbacks* callbacks =
-      pending_callbacks_.Lookup(request_id);
+      pending_registration_callbacks_.Lookup(request_id);
   DCHECK(callbacks);
   if (!callbacks)
     return;
 
   callbacks->onSuccess(GetServiceWorkerRegistration(info, true));
-  pending_callbacks_.Remove(request_id);
+  pending_registration_callbacks_.Remove(request_id);
 }
 
 void ServiceWorkerDispatcher::OnUnregistered(
     int thread_id,
     int request_id) {
-  WebServiceWorkerRegistrationCallbacks* callbacks =
-      pending_callbacks_.Lookup(request_id);
+  WebServiceWorkerUnregistrationCallbacks* callbacks =
+      pending_unregistration_callbacks_.Lookup(request_id);
   DCHECK(callbacks);
   if (!callbacks)
     return;
-
+#ifdef DISABLE_SERVICEWORKER_UNREGISTER_RESOLVE_TO_BOOLEAN
   callbacks->onSuccess(NULL);
-  pending_callbacks_.Remove(request_id);
+#else
+  bool is_success = true;
+  callbacks->onSuccess(&is_success);
+#endif
+  pending_unregistration_callbacks_.Remove(request_id);
 }
 
 void ServiceWorkerDispatcher::OnRegistrationError(
     int thread_id,
     int request_id,
     WebServiceWorkerError::ErrorType error_type,
     const base::string16& message) {
   WebServiceWorkerRegistrationCallbacks* callbacks =
-      pending_callbacks_.Lookup(request_id);
+      pending_registration_callbacks_.Lookup(request_id);

[nhiroki, 2014/08/29 07:27:29]

Probably we can reach here when the unregisteration failed in the browser-side
(ie. ServiceWorkerDispatcherHost) and hit the DCHECK due to the missing
callback.

[shimazu, 2014/09/01 05:35:34]

Done.

   DCHECK(callbacks);
   if (!callbacks)
     return;
 
   scoped_ptr<WebServiceWorkerError> error(
       new WebServiceWorkerError(error_type, message));
   callbacks->onError(error.release());
-  pending_callbacks_.Remove(request_id);
+  pending_registration_callbacks_.Remove(request_id);
 }
 
 void ServiceWorkerDispatcher::OnServiceWorkerStateChanged(
     int thread_id,
     int handle_id,
     blink::WebServiceWorkerState state) {
   WorkerObjectMap::iterator worker = service_workers_.find(handle_id);
   if (worker != service_workers_.end())
     worker->second->OnStateChanged(state);
 
@@ skipping 177 matching lines @@
   registrations_[registration_handle_id] = registration;
 }
 
 void ServiceWorkerDispatcher::RemoveServiceWorkerRegistration(
     int registration_handle_id) {
   DCHECK(ContainsKey(registrations_, registration_handle_id));
   registrations_.erase(registration_handle_id);
 }
 
 }  // namespace content