Add support for CallbackPromiseAdapter<void, T> matching WebCallbacks<void, T>.

Source/modules/geofencing/Geofencing.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 "modules/geofencing/Geofencing.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "modules/geofencing/GeofencingError.h"
 #include "modules/geofencing/GeofencingRegion.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebGeofencingProvider.h"
 
 namespace blink {
 
 namespace {
 
-// Copy of same class in ServiceWorkerContainer.cpp
-class UndefinedValue {
-public:
-    typedef blink::WebGeofencingError WebType;
-    static V8UndefinedType take(ScriptPromiseResolver* resolver, WebType* value)
-    {
-        ASSERT(!value); // Anything passed here will be leaked.
-        return V8UndefinedType();
-    }
-
-    static void dispose(WebType* value)
-    {
-        ASSERT(!value); // Anything passed here will be leaked.
-    }
-
-private:
-    UndefinedValue();
-};
-
 class RegionArray {
 public:
     typedef blink::WebVector<blink::WebGeofencingRegion> WebType;
     static HeapVector<Member<GeofencingRegion> > take(ScriptPromiseResolver* resolver, WebType* regionsRaw)
     {
         OwnPtr<WebType> webRegions = adoptPtr(regionsRaw);
         HeapVector<Member<GeofencingRegion> > regions;
         for (size_t i = 0; i < webRegions->size(); ++i) {
             regions.append(GeofencingRegion::createFromWebRegion((*webRegions)[i]));
         }
@@ skipping 18 matching lines @@
 
 ScriptPromise Geofencing::registerRegion(ScriptState* scriptState, GeofencingRegion* region)
 {
     WebGeofencingProvider* provider = Platform::current()->geofencingProvider();
     if (!provider)
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError));
 
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     // TODO(mek): somehow pass a reference to the current serviceworker to the provider.
-    provider->registerRegion(region->webRegion(), new CallbackPromiseAdapter<UndefinedValue, GeofencingError>(resolver));
+    provider->registerRegion(region->webRegion(), new CallbackPromiseAdapter<void, GeofencingError>(resolver));
     return promise;
 }
 
 ScriptPromise Geofencing::unregisterRegion(ScriptState* scriptState, const String& regionId)
 {
     WebGeofencingProvider* provider = Platform::current()->geofencingProvider();
     if (!provider)
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError));
 
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     // TODO(mek): somehow pass a reference to the current serviceworker to the provider.
-    provider->unregisterRegion(regionId, new CallbackPromiseAdapter<UndefinedValue, GeofencingError>(resolver));
+    provider->unregisterRegion(regionId, new CallbackPromiseAdapter<void, GeofencingError>(resolver));
     return promise;
 }
 
 ScriptPromise Geofencing::getRegisteredRegions(ScriptState* scriptState) const
 {
     WebGeofencingProvider* provider = Platform::current()->geofencingProvider();
     if (!provider)
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError));
 
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     // TODO(mek): somehow pass a reference to the current serviceworker to the provider.

[haraken, 2014/08/20 00:43:27]

Nit: Use a FIXME instead of TODO(mek) in Blink.

     provider->getRegisteredRegions(new CallbackPromiseAdapter<RegionArray, GeofencingError>(resolver));
     return promise;
 }
 
 } // namespace blink