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

public/platform/modules/background_sync/WebSyncProvider.h

 // Copyright 2015 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.
 
 #ifndef WebSyncProvider_h
 #define WebSyncProvider_h
 
 #include "public/platform/WebCallbacks.h"
 #include "public/platform/WebCommon.h"
+#include "public/platform/WebPassOwnPtr.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebVector.h"
 #include "public/platform/modules/background_sync/WebSyncError.h"
 #include "public/platform/modules/background_sync/WebSyncPermissionStatus.h"
 #include "public/platform/modules/background_sync/WebSyncRegistration.h"
 
 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&>;
 
-using WebSyncRegistrationCallbacks = WebCallbacks<WebSyncRegistration*, WebSyncError*>;
-using WebSyncNotifyWhenDoneCallbacks = WebCallbacks<bool*, WebSyncError*>;
-using WebSyncUnregistrationCallbacks = WebCallbacks<bool*, WebSyncError*>;
-using WebSyncGetRegistrationsCallbacks = WebCallbacks<WebVector<WebSyncRegistration*>*, WebSyncError*>;
-using WebSyncGetPermissionStatusCallbacks = WebCallbacks<WebSyncPermissionStatus*, 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 {
 public:
     virtual ~WebSyncProvider() { }
 
     // Takes ownership of the WebSyncRegistrationCallbacks.
     // Does not take ownership of the WebServiceWorkerRegistration.
     virtual void registerBackgroundSync(const WebSyncRegistration*, WebServiceWorkerRegistration*, WebSyncRegistrationCallbacks*) = 0;
 
     // Takes ownership of the WebSyncUnregistrationCallbacks.
     // Does not take ownership of the WebServiceWorkerRegistration.
     virtual void unregisterBackgroundSync(blink::WebSyncRegistration::Periodicity, int64_t, const WebString&, WebServiceWorkerRegistration*, WebSyncUnregistrationCallbacks*) = 0;
 
     // Takes ownership of the WebSyncRegistrationCallbacks.
     // Does not take ownership of the WebServiceWorkerRegistration.
     virtual void getRegistration(blink::WebSyncRegistration::Periodicity, const WebString&, WebServiceWorkerRegistration*, WebSyncRegistrationCallbacks*) = 0;
 
     // Takes ownership of the WebSyncGetRegistrationsCallbacks.
     // Does not take ownership of the WebServiceWorkerRegistration.
     virtual void getRegistrations(blink::WebSyncRegistration::Periodicity, WebServiceWorkerRegistration*, WebSyncGetRegistrationsCallbacks*) = 0;
 
     // Takes ownership of the WebSyncGetPermissionStatusCallbacks.
     // Does not take ownership of the WebServiceWorkerRegistration.
     virtual void getPermissionStatus(blink::WebSyncRegistration::Periodicity, WebServiceWorkerRegistration*, WebSyncGetPermissionStatusCallbacks*) = 0;
 
     // Takes ownership of the WebSyncNotifyWhenDoneCallbacks.
     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."));

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

Won't this fail because of the WebSyncError*?

[yhirano, 2015/08/27 02:21:52]

Technically it's OK because onError(WebSyncError*) is defined at L44. From code
simplicity your suggestion is reasonable and so I fixed it.

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

"From code simplicity viewpoint", I mean.

         delete callbacks;
     }
 
     // Takes ownership of the WebServiceWorkerRegistration.
     virtual void trackRegistration(WebSyncRegistration* registration)
     {
         // TODO(jkarlin): After landing both legs of the releaseRegistration CLs, make this a pure virtual function.
         return;
     }
 
     virtual void releaseRegistration(int64_t syncId)
     {
         // TODO(jkarlin): After landing both legs of the releaseRegistration CLs, make this a pure virtual function.
         return;
     }
 };
 
 } // namespace blink
 
 #endif // WebSyncProvider_h