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

Source/modules/serviceworkers/ServiceWorkerRegistration.cpp

 // 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 "config.h"
 #include "ServiceWorkerRegistration.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 19 matching lines @@
     }
     static void dispose(WebType* registration)
     {
         ASSERT(!registration); // Anything passed here will be leaked.
     }
 
 private:
     UndefinedValue();
 };
 
+class BooleanValue {
+public:
+    typedef bool WebType;
+    static bool take(ScriptPromiseResolver* resolver, WebType* boolean)
+    {
+        return boolean;

[nhiroki, 2014/08/28 10:13:21]

*boolean ?

[shimazu, 2014/08/29 07:07:07]

Done.

+    }
+    static void dispose(WebType* boolean)
+    {
+    }
+
+private:
+    BooleanValue();
+};
+
 static void deleteIfNoExistingOwner(WebServiceWorker* serviceWorker)
 {
     if (serviceWorker && !serviceWorker->proxy())
         delete serviceWorker;
 }
 
 const AtomicString& ServiceWorkerRegistration::interfaceName() const
 {
     return EventTargetNames::ServiceWorkerRegistration;
 }
@@ skipping 58 matching lines @@
     }
 
     RefPtr<SecurityOrigin> documentOrigin = scriptState->executionContext()->securityOrigin();
     KURL scopeURL = scriptState->executionContext()->completeURL(scope());
     scopeURL.removeFragmentIdentifier();
     if (!scope().isEmpty() && !documentOrigin->canRequest(scopeURL)) {
         resolver->reject(DOMException::create(SecurityError, "Can only unregister for scopes in the document's origin."));
         return promise;
     }
 
+#ifdef SERVICEWORKER_UNREGISTER_DISABLE_NEW_FEATURE
     m_provider->unregisterServiceWorker(scopeURL, new CallbackPromiseAdapter<UndefinedValue, ServiceWorkerError>(resolver));
+#else
+    m_provider->unregisterServiceWorker(scopeURL, new CallbackPromiseAdapter<BooleanValue, ServiceWorkerError>(resolver));
+#endif
     return promise;
 }
 
 PassRefPtrWillBeRawPtr<ServiceWorkerRegistration> ServiceWorkerRegistration::getOrCreate(ExecutionContext* executionContext, WebServiceWorkerRegistration* outerRegistration)
 {
     if (!outerRegistration)
         return nullptr;
 
     WebServiceWorkerRegistrationProxy* proxy = outerRegistration->proxy();
     if (proxy) {
@@ skipping 41 matching lines @@
 
 void ServiceWorkerRegistration::stop()
 {
     if (m_stopped)
         return;
     m_stopped = true;
     m_outerRegistration->proxyStopped();
 }
 
 } // namespace blink