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

public/platform/WebServiceWorkerProvider.h

Index: public/platform/WebServiceWorkerProvider.h
diff --git a/public/platform/WebServiceWorkerProvider.h b/public/platform/WebServiceWorkerProvider.h
index eb2adf7618e3e16bc011258bb3ccec1ef983f7db..9e138e05943234e50d469e66a134bc18e2e90cef 100644
--- a/public/platform/WebServiceWorkerProvider.h
+++ b/public/platform/WebServiceWorkerProvider.h
@@ -42,10 +42,6 @@ class WebServiceWorkerProviderClient;
 class WebServiceWorkerRegistration;
 struct WebServiceWorkerError;
 
-// FIXME: Remove this macro after the chromium side patch is applied
-// 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.
@@ -58,11 +54,7 @@ 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*) { }