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

public/platform/WebServiceWorkerProvider.h

Index: public/platform/WebServiceWorkerProvider.h
diff --git a/public/platform/WebServiceWorkerProvider.h b/public/platform/WebServiceWorkerProvider.h
index 53dd504b28d57bc68a8ef178a0a4382cb0bc2dad..f02a8a6964e288b7cfc032f402219229305b4b21 100644
--- a/public/platform/WebServiceWorkerProvider.h
+++ b/public/platform/WebServiceWorkerProvider.h
@@ -42,6 +42,10 @@ class WebServiceWorkerProviderClient;
 class WebServiceWorkerRegistration;
 struct WebServiceWorkerError;
 
+// FIXME(shimazu): Remove this macro after the chromium side patch is applied

[tkent, 2014/09/01 03:11:24]

Please refer to #3 of http://www.chromium.org/blink/coding-style#TOC-Comments

[shimazu, 2014/09/01 05:13:47]

Done.

+// See: https://crbug.com/390894
+#define DISABLE_SERVICEWORKER_UNREGISTER_RESOLVE_TO_BOOLEAN
+
 // Created on the main thread, and may be passed to another script context
 // thread (e.g. worker thread) later. All methods of this class must be called
 // on the single script context thread.
@@ -54,15 +58,16 @@ public:
     // The WebServiceWorkerRegistration and WebServiceWorkerError ownership are
     // passed to the WebServiceWorkerRegistrationCallbacks implementation.
     typedef WebCallbacks<WebServiceWorkerRegistration, WebServiceWorkerError> WebServiceWorkerRegistrationCallbacks;
+#ifdef DISABLE_SERVICEWORKER_UNREGISTER_RESOLVE_TO_BOOLEAN
+    typedef WebServiceWorkerRegistrationCallbacks WebServiceWorkerUnregistrationCallbacks;
+#else
+    typedef WebCallbacks<bool, WebServiceWorkerError> WebServiceWorkerUnregistrationCallbacks;
+#endif
 
     virtual void registerServiceWorker(const WebURL& pattern, const WebURL& scriptUrl, WebServiceWorkerRegistrationCallbacks*) { }
 
-    // Unregisters the ServiceWorker for a given scope. The provider
-    // must always pass null to onSuccess.
-    // FIXME: "unregister" does not provide a WebServiceWorkerRegistration,
-    // revisit this to clean up the the callback type to not take a
-    // WebServiceWorkerRegistration*.
-    virtual void unregisterServiceWorker(const WebURL& pattern, WebServiceWorkerRegistrationCallbacks*) { }
+    // Unregisters the ServiceWorker for a given scope.
+    virtual void unregisterServiceWorker(const WebURL& pattern, WebServiceWorkerUnregistrationCallbacks*) { }
 
     virtual ~WebServiceWorkerProvider() { }
 };