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

Source/modules/cachestorage/InspectorCacheStorageAgent.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/cachestorage/InspectorCacheStorageAgent.h"
 
 #include "core/InspectorBackendDispatcher.h"
 #include "core/InspectorTypeBuilder.h"
 #include "platform/JSONValues.h"
@@ skipping 104 matching lines @@
 
 public:
     RequestCacheNames(const String& securityOrigin, PassRefPtrWillBeRawPtr<RequestCacheNamesCallback> callback)
         : m_securityOrigin(securityOrigin)
         , m_callback(callback)
     {
     }
 
     ~RequestCacheNames() override { }
 
-    void onSuccess(WebVector<WebString>* caches)
+    void onSuccess(const WebVector<WebString>& caches) override
     {
         RefPtr<Array<Cache>> array = Array<Cache>::create();
-        for (size_t i = 0; i < caches->size(); i++) {
-            String name = String((*caches)[i]);
+        for (size_t i = 0; i < caches.size(); i++) {
+            String name = String(caches[i]);
             RefPtr<Cache> entry = Cache::create()
                 .setSecurityOrigin(m_securityOrigin)
                 .setCacheName(name)
                 .setCacheId(buildCacheId(m_securityOrigin, name));
             array->addItem(entry);
         }
         m_callback->sendSuccess(array);
     }
 
-    void onError(WebServiceWorkerCacheError* error)
+    void onError(WebServiceWorkerCacheError error) override
     {
-        m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(*error).data()));
+        m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(error).data()));
     }
 
 private:
     String m_securityOrigin;
     RefPtrWillBePersistent<RequestCacheNamesCallback> m_callback;
 };
 
 struct DataRequestParams {
     String cacheName;
     int skipCount;
@@ skipping 70 matching lines @@
         const DataRequestParams& params, const WebServiceWorkerRequest& request,
         PassRefPtr<ResponsesAccumulator> accum, PassRefPtrWillBeRawPtr<RequestEntriesCallback> callback)
         : m_params(params)
         , m_request(request)
         , m_accumulator(accum)
         , m_callback(callback)
     {
     }
     ~GetCacheResponsesForRequestData() override { }
 
-    void onSuccess(WebServiceWorkerResponse* response)
+    void onSuccess(const WebServiceWorkerResponse& response) override
     {
-        m_accumulator->addRequestResponsePair(m_request, *response);
+        m_accumulator->addRequestResponsePair(m_request, response);
     }
 
-    void onError(WebServiceWorkerCacheError* error)
+    void onError(WebServiceWorkerCacheError error) override
     {
-        m_callback->sendFailure(String::format("Error requesting responses for cache  %s: %s", m_params.cacheName.utf8().data(), serviceWorkerCacheErrorString(*error).data()));
+        m_callback->sendFailure(String::format("Error requesting responses for cache  %s: %s", m_params.cacheName.utf8().data(), serviceWorkerCacheErrorString(error).data()));
     }
 
 private:
     DataRequestParams m_params;
     WebServiceWorkerRequest m_request;
     RefPtr<ResponsesAccumulator> m_accumulator;
     RefPtrWillBePersistent<RequestEntriesCallback> m_callback;
 };
 
 class GetCacheKeysForRequestData : public WebServiceWorkerCache::CacheWithRequestsCallbacks {
     WTF_MAKE_NONCOPYABLE(GetCacheKeysForRequestData);
 
 public:
     GetCacheKeysForRequestData(const DataRequestParams& params, PassOwnPtr<WebServiceWorkerCache> cache, PassRefPtrWillBeRawPtr<RequestEntriesCallback> callback)
         : m_params(params)
         , m_cache(cache)
         , m_callback(callback)
     {
     }
     ~GetCacheKeysForRequestData() override { }
 
-    void onSuccess(WebVector<WebServiceWorkerRequest>* requests)
+    WebServiceWorkerCache* cache() { return m_cache.get(); }
+    void onSuccess(const WebVector<WebServiceWorkerRequest>& requests) override
     {
-        if (requests->isEmpty()) {
+        if (requests.isEmpty()) {
             RefPtr<Array<DataEntry>> array = Array<DataEntry>::create();
             m_callback->sendSuccess(array, false);
             return;
         }
-        RefPtr<ResponsesAccumulator> accumulator = adoptRef(new ResponsesAccumulator(requests->size(), m_params, m_callback));
+        RefPtr<ResponsesAccumulator> accumulator = adoptRef(new ResponsesAccumulator(requests.size(), m_params, m_callback));
 
-        for (size_t i = 0; i < requests->size(); i++) {
-            const auto& request = (*requests)[i];
+        for (size_t i = 0; i < requests.size(); i++) {
+            const auto& request = requests[i];
             auto* cacheRequest = new GetCacheResponsesForRequestData(m_params, request, accumulator, m_callback);
             m_cache->dispatchMatch(cacheRequest, request, WebServiceWorkerCache::QueryParams());
         }
     }
 
-    void onError(WebServiceWorkerCacheError* error)
+    void onError(WebServiceWorkerCacheError error) override
     {
-        m_callback->sendFailure(String::format("Error requesting requests for cache %s: %s", m_params.cacheName.utf8().data(), serviceWorkerCacheErrorString(*error).data()));
+        m_callback->sendFailure(String::format("Error requesting requests for cache %s: %s", m_params.cacheName.utf8().data(), serviceWorkerCacheErrorString(error).data()));
     }
 
 private:
     DataRequestParams m_params;
     OwnPtr<WebServiceWorkerCache> m_cache;
     RefPtrWillBePersistent<RequestEntriesCallback> m_callback;
 };
 
 class GetCacheForRequestData
     : public WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks {
     WTF_MAKE_NONCOPYABLE(GetCacheForRequestData);
 
 public:
     GetCacheForRequestData(const DataRequestParams& params, PassRefPtrWillBeRawPtr<RequestEntriesCallback> callback)
         : m_params(params)
         , m_callback(callback)
     {
     }
     ~GetCacheForRequestData() override { }
 
-    void onSuccess(WebServiceWorkerCache* cache)
+    void onSuccess(WebPassOwnPtr<WebServiceWorkerCache> cache) override
     {
-        auto* cacheRequest = new GetCacheKeysForRequestData(m_params, adoptPtr(cache), m_callback);
-        cache->dispatchKeys(cacheRequest, nullptr, WebServiceWorkerCache::QueryParams());
+        auto* cacheRequest = new GetCacheKeysForRequestData(m_params, cache.release(), m_callback);
+        cacheRequest->cache()->dispatchKeys(cacheRequest, nullptr, WebServiceWorkerCache::QueryParams());
     }
 
-    void onError(WebServiceWorkerCacheError* error)
+    void onError(WebServiceWorkerCacheError error) override
     {
-        m_callback->sendFailure(String::format("Error requesting cache %s: %s", m_params.cacheName.utf8().data(), serviceWorkerCacheErrorString(*error).data()));
+        m_callback->sendFailure(String::format("Error requesting cache %s: %s", m_params.cacheName.utf8().data(), serviceWorkerCacheErrorString(error).data()));
     }
 
 private:
     DataRequestParams m_params;
     RefPtrWillBePersistent<RequestEntriesCallback> m_callback;
 };
 
 class DeleteCache : public WebServiceWorkerCacheStorage::CacheStorageCallbacks {
     WTF_MAKE_NONCOPYABLE(DeleteCache);
 
 public:
     DeleteCache(PassRefPtrWillBeRawPtr<DeleteCacheCallback> callback)
         : m_callback(callback)
     {
     }
     ~DeleteCache() override { }
 
-    void onSuccess()
+    void onSuccess() override
     {
         m_callback->sendSuccess();
     }
 
-    void onError(WebServiceWorkerCacheError* error)
+    void onError(WebServiceWorkerCacheError error) override
     {
-        m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(*error).data()));
+        m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(error).data()));
     }
 
 private:
     RefPtrWillBePersistent<DeleteCacheCallback> m_callback;
 };
 
 class DeleteCacheEntry : public WebServiceWorkerCache::CacheBatchCallbacks {
     WTF_MAKE_NONCOPYABLE(DeleteCacheEntry);
 public:
 
     DeleteCacheEntry(PassRefPtrWillBeRawPtr<DeleteEntryCallback> callback)
         : m_callback(callback)
     {
     }
     ~DeleteCacheEntry() override { }
 
-    void onSuccess()
+    void onSuccess() override
     {
         m_callback->sendSuccess();
     }
 
-    void onError(WebServiceWorkerCacheError error)
+    void onError(WebServiceWorkerCacheError error) override
     {
         m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(error).data()));
     }
 
 private:
     RefPtrWillBePersistent<DeleteEntryCallback> m_callback;
 };
 
 class GetCacheForDeleteEntry
     : public WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks {
     WTF_MAKE_NONCOPYABLE(GetCacheForDeleteEntry);
 
 public:
     GetCacheForDeleteEntry(const String& requestSpec, const String& cacheName, PassRefPtrWillBeRawPtr<DeleteEntryCallback> callback)
         : m_requestSpec(requestSpec)
         , m_cacheName(cacheName)
         , m_callback(callback)
     {
     }
     ~GetCacheForDeleteEntry() override { }
 
-    void onSuccess(WebServiceWorkerCache* cache)
+    void onSuccess(WebPassOwnPtr<WebServiceWorkerCache> cache) override
     {
-        auto* deleteRequest = new DeleteCacheEntry( m_callback);
+        auto* deleteRequest = new DeleteCacheEntry(m_callback);
         BatchOperation deleteOperation;
         deleteOperation.operationType = WebServiceWorkerCache::OperationTypeDelete;
         deleteOperation.request.setURL(KURL(ParsedURLString, m_requestSpec));
         Vector<BatchOperation> operations;
         operations.append(deleteOperation);
-        cache->dispatchBatch(deleteRequest, WebVector<BatchOperation>(operations));
+        cache.release()->dispatchBatch(deleteRequest, WebVector<BatchOperation>(operations));
     }
 
-    void onError(WebServiceWorkerCacheError* error)
+    void onError(WebServiceWorkerCacheError error) override
     {
-        m_callback->sendFailure(String::format("Error requesting cache %s: %s", m_cacheName.utf8().data(), serviceWorkerCacheErrorString(*error).data()));
+        m_callback->sendFailure(String::format("Error requesting cache %s: %s", m_cacheName.utf8().data(), serviceWorkerCacheErrorString(error).data()));
     }
 
 private:
     String m_requestSpec;
     String m_cacheName;
     RefPtrWillBePersistent<DeleteEntryCallback> m_callback;
 };
 
 } // namespace
 
@@ skipping 61 matching lines @@
     OwnPtr<WebServiceWorkerCacheStorage> cache = assertCacheStorageAndNameForId(errorString, cacheId, &cacheName);
     if (!cache) {
         callback->sendFailure(*errorString);
         return;
     }
     cache->dispatchOpen(new GetCacheForDeleteEntry(request, cacheName, callback), WebString(cacheName));
 }
 
 
 } // namespace blink