[CacheStorage] Use appopriate type parameters for WebCallbacks (3/3).

This series of CLs fixes WebCallback parameter types used in CacheStorage.

 - WebServiceWorkerResponse* (ownership not transferred)
  => const WebServiceWorkerResponse&
 - WebVector<WebServiceWorkerResponse>* (ownership not transferred)
  => const WebVector<WebServiceWorkerResponse>&
 - WebVector<WebServiceWorkerRequest>* (ownership not transferred)
  => const WebVector<WebServiceWorkerRequest>&
 - WebServiceWorkerCache* (ownership transferred)
  => WebPassOwnPtr<WebServiceWorkerCache>
 - WebVector<WebString>* (ownership not transferred)
  => const WebVector<WebString>&
 - WebServiceWorkerCacheError* (ownership transferred)
  => WebServiceWorkerCacheError

1/3: https://codereview.chromium.org/1284173004/
2/3: https://codereview.chromium.org/1284283003/
3/3: https://codereview.chromium.org/1296723005/

BUG=493531

Review URL: https://codereview.chromium.org/1296723005

git-svn-id: svn://svn.chromium.org/blink/trunk@200897 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerCache.h

@@ -20,39 +20,9 @@ namespace blink {
 // This object is owned by Blink, and should be destroyed as each Cache instance is no longer in use.
 class WebServiceWorkerCache {
 public:
-    class CacheMatchCallbacks : public WebCallbacks<const WebServiceWorkerResponse&, WebServiceWorkerCacheError> {
-    public:
-        void onSuccess(WebServiceWorkerResponse* r) { onSuccess(*r); }
-        void onError(WebServiceWorkerCacheError* e)
-        {
-            onError(*e);
-            delete e;
-        }
-        void onSuccess(const WebServiceWorkerResponse&) override {}
-        void onError(WebServiceWorkerCacheError) override {}
-    };
-    class CacheWithResponsesCallbacks : public WebCallbacks<const WebVector<WebServiceWorkerResponse>&, WebServiceWorkerCacheError> {
-    public:
-        void onSuccess(WebVector<WebServiceWorkerResponse>* r) { onSuccess(*r); }
-        void onError(WebServiceWorkerCacheError* e)
-        {
-            onError(*e);
-            delete e;
-        }
-        void onSuccess(const WebVector<WebServiceWorkerResponse>&) override {}
-        void onError(WebServiceWorkerCacheError) override {}
-    };
-    class CacheWithRequestsCallbacks : public WebCallbacks<const WebVector<WebServiceWorkerRequest>&, WebServiceWorkerCacheError> {
-    public:
-        void onSuccess(WebVector<WebServiceWorkerRequest>* r) { onSuccess(*r); }
-        void onError(WebServiceWorkerCacheError* e)
-        {
-            onError(*e);
-            delete e;
-        }
-        void onSuccess(const WebVector<WebServiceWorkerRequest>&) override {}
-        void onError(WebServiceWorkerCacheError) override {}
-    };
+    using CacheMatchCallbacks = WebCallbacks<const WebServiceWorkerResponse&, WebServiceWorkerCacheError>;
+    using CacheWithResponsesCallbacks = WebCallbacks<const WebVector<WebServiceWorkerResponse>&, WebServiceWorkerCacheError>;
+    using CacheWithRequestsCallbacks = WebCallbacks<const WebVector<WebServiceWorkerRequest>&, WebServiceWorkerCacheError>;
     using CacheBatchCallbacks = WebCallbacks<void, WebServiceWorkerCacheError>;
 
     virtual ~WebServiceWorkerCache() { }

third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerCacheStorage.h

@@ -22,51 +22,10 @@ class WebServiceWorkerCache;
 // after operations complete.
 class WebServiceWorkerCacheStorage {
 public:
-    class CacheStorageCallbacks : public WebCallbacks<void, WebServiceWorkerCacheError> {
-    public:
-        void onError(WebServiceWorkerCacheError* e)
-        {
-            onError(*e);
-            delete e;
-        }
-        void onError(WebServiceWorkerCacheError) override {}
-    };
-    class CacheStorageWithCacheCallbacks : public WebCallbacks<WebPassOwnPtr<WebServiceWorkerCache>, WebServiceWorkerCacheError> {
-    public:
-        void onSuccess(WebServiceWorkerCache* r)
-        {
-            onSuccess(adoptWebPtr(r));
-        }
-        void onError(WebServiceWorkerCacheError* e)
-        {
-            onError(*e);
-            delete e;
-        }
-        void onSuccess(WebPassOwnPtr<WebServiceWorkerCache>) override {}
-        void onError(WebServiceWorkerCacheError) override {}
-    };
-    class CacheStorageKeysCallbacks : public WebCallbacks<const WebVector<WebString>&, WebServiceWorkerCacheError> {
-    public:
-        void onSuccess(WebVector<WebString>* r) { onSuccess(*r); }
-        void onError(WebServiceWorkerCacheError* e)
-        {
-            onError(*e);
-            delete e;
-        }
-        void onSuccess(const WebVector<WebString>&) override {}
-        void onError(WebServiceWorkerCacheError) override {}
-    };
-    class CacheStorageMatchCallbacks : public WebCallbacks<const WebServiceWorkerResponse&, WebServiceWorkerCacheError> {
-    public:
-        void onSuccess(WebServiceWorkerResponse* r) { onSuccess(*r); }
-        void onError(WebServiceWorkerCacheError* e)
-        {
-            onError(*e);
-            delete e;
-        }
-        void onSuccess(const WebServiceWorkerResponse&) override {}
-        void onError(WebServiceWorkerCacheError) override {}
-    };
+    using CacheStorageCallbacks = WebCallbacks<void, WebServiceWorkerCacheError>;
+    using CacheStorageWithCacheCallbacks = WebCallbacks<WebPassOwnPtr<WebServiceWorkerCache>, WebServiceWorkerCacheError>;
+    using CacheStorageKeysCallbacks = WebCallbacks<const WebVector<WebString>&, WebServiceWorkerCacheError>;
+    using CacheStorageMatchCallbacks = WebCallbacks<const WebServiceWorkerResponse&, WebServiceWorkerCacheError>;
 
     virtual ~WebServiceWorkerCacheStorage() { }