[BackgroundSync] Use appopriate type parameters for WebCallbacks (4/4)

public/platform/modules/background_sync/WebSyncProvider.h

Index: public/platform/modules/background_sync/WebSyncProvider.h
diff --git a/public/platform/modules/background_sync/WebSyncProvider.h b/public/platform/modules/background_sync/WebSyncProvider.h
index 5f1ff0ad688ea91d59ddaa85cde2a07bb44b96c2..016c7face2ef1b55b064ce7bc443f1db7cb33867 100644
--- a/public/platform/modules/background_sync/WebSyncProvider.h
+++ b/public/platform/modules/background_sync/WebSyncProvider.h
@@ -17,77 +17,10 @@
 namespace blink {
 
 class WebServiceWorkerRegistration;
-template <>
-class WebCallbacks<WebPassOwnPtr<WebSyncRegistration>, const WebSyncError&> {
-public:
-    virtual ~WebCallbacks() {}
-    void onSuccess(WebSyncRegistration* r) { onSuccess(adoptWebPtr(r)); }
-    void onError(WebSyncError* e)
-    {
-        onError(*e);
-        delete e;
-    }
-    virtual void onSuccess(WebPassOwnPtr<WebSyncRegistration>) = 0;
-    virtual void onError(const WebSyncError&) = 0;
-};
 using WebSyncRegistrationCallbacks = WebCallbacks<WebPassOwnPtr<WebSyncRegistration>, const WebSyncError&>;
-
-template <>
-class WebCallbacks<bool, const WebSyncError&> {
-public:
-    virtual ~WebCallbacks() {}
-    void onSuccess(bool* r)
-    {
-        onSuccess(*r);
-        delete r;
-    }
-    void onError(WebSyncError* e)
-    {
-        onError(*e);
-        delete e;
-    }
-    virtual void onSuccess(bool) = 0;
-    virtual void onError(const WebSyncError&) = 0;
-};
 using WebSyncNotifyWhenDoneCallbacks = WebCallbacks<bool, const WebSyncError&>;
 using WebSyncUnregistrationCallbacks = WebCallbacks<bool, const WebSyncError&>;
-
-template <>
-class WebCallbacks<const WebVector<WebSyncRegistration*>&, const WebSyncError&> {
-public:
-    virtual ~WebCallbacks() {}
-    void onSuccess(WebVector<WebSyncRegistration*>* r)
-    {
-        onSuccess(*r);
-        delete r;
-    }
-    void onError(WebSyncError* e)
-    {
-        onError(*e);
-        delete e;
-    }
-    virtual void onSuccess(const WebVector<WebSyncRegistration*>&) = 0;
-    virtual void onError(const WebSyncError&) = 0;
-};
 using WebSyncGetRegistrationsCallbacks = WebCallbacks<const WebVector<WebSyncRegistration*>&, const WebSyncError&>;
-
-template <>
-class WebCallbacks<WebSyncPermissionStatus, const WebSyncError&> {
-public:
-    virtual ~WebCallbacks() {}
-    void onSuccess(WebSyncPermissionStatus* r)
-    {
-        onSuccess(*r);
-        delete r;
-    }
-    void onError(WebSyncError* e)
-    {
-        onError(*e);
-        delete e;
-    }
-    virtual void onSuccess(WebSyncPermissionStatus) = 0;
-    virtual void onError(const WebSyncError&) = 0;
-};
 using WebSyncGetPermissionStatusCallbacks = WebCallbacks<WebSyncPermissionStatus, const WebSyncError&>;
 
 class WebSyncProvider {
@@ -118,7 +51,7 @@ public:
     virtual void notifyWhenDone(int64_t syncId, WebSyncNotifyWhenDoneCallbacks* callbacks)
     {
         // TODO(jkarlin): After landing both legs of the notifyWhenDone CLs, make this a pure virtual function.
-        callbacks->onError(new WebSyncError(WebSyncError::ErrorTypeAbort, "Function not implemented."));
+        callbacks->onError(WebSyncError(WebSyncError::ErrorTypeAbort, "Function not implemented."));

[jkarlin, 2015/08/26 13:21:41]

Shouldn't this fix be in the second CL?

[yhirano, 2015/08/27 02:23:05]

Done.

         delete callbacks;
     }