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

Source/modules/cachestorage/CacheTest.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/Cache.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
@@ skipping 94 matching lines @@
     void setExpectedBatchOperations(const WebVector<BatchOperation>* expectedBatchOperations) { m_expectedBatchOperations = expectedBatchOperations; }
 
     // From WebServiceWorkerCache:
     void dispatchMatch(CacheMatchCallbacks* callbacks, const WebServiceWorkerRequest& webRequest, const QueryParams& queryParams) override
     {
         m_lastErrorWebCacheMethodCalled = "dispatchMatch";
         checkUrlIfProvided(webRequest.url());
         checkQueryParamsIfProvided(queryParams);
 
         OwnPtr<CacheMatchCallbacks> ownedCallbacks(adoptPtr(callbacks));
-        return callbacks->onError(new WebServiceWorkerCacheError(m_error));
+        return callbacks->onError(m_error);
     }
 
     void dispatchMatchAll(CacheWithResponsesCallbacks* callbacks, const WebServiceWorkerRequest& webRequest, const QueryParams& queryParams) override
     {
         m_lastErrorWebCacheMethodCalled = "dispatchMatchAll";
         checkUrlIfProvided(webRequest.url());
         checkQueryParamsIfProvided(queryParams);
 
         OwnPtr<CacheWithResponsesCallbacks> ownedCallbacks(adoptPtr(callbacks));
-        return callbacks->onError(new WebServiceWorkerCacheError(m_error));
+        return callbacks->onError(m_error);
     }
 
     void dispatchKeys(CacheWithRequestsCallbacks* callbacks, const WebServiceWorkerRequest* webRequest, const QueryParams& queryParams) override
     {
         m_lastErrorWebCacheMethodCalled = "dispatchKeys";
         if (webRequest) {
             checkUrlIfProvided(webRequest->url());
             checkQueryParamsIfProvided(queryParams);
         }
 
         OwnPtr<CacheWithRequestsCallbacks> ownedCallbacks(adoptPtr(callbacks));
-        return callbacks->onError(new WebServiceWorkerCacheError(m_error));
+        return callbacks->onError(m_error);
     }
 
     void dispatchBatch(CacheBatchCallbacks* callbacks, const WebVector<BatchOperation>& batchOperations) override
     {
         m_lastErrorWebCacheMethodCalled = "dispatchBatch";
         checkBatchOperationsIfProvided(batchOperations);
 
         OwnPtr<CacheBatchCallbacks> ownedCallbacks(adoptPtr(callbacks));
         return callbacks->onError(m_error);
     }
@@ skipping 319 matching lines @@
 
 class MatchTestCache : public NotImplementedErrorCache {
 public:
     MatchTestCache(WebServiceWorkerResponse& response)
         : m_response(response) { }
 
     // From WebServiceWorkerCache:
     void dispatchMatch(CacheMatchCallbacks* callbacks, const WebServiceWorkerRequest& webRequest, const QueryParams& queryParams) override
     {
         OwnPtr<CacheMatchCallbacks> ownedCallbacks(adoptPtr(callbacks));
-        return callbacks->onSuccess(&m_response);
+        return callbacks->onSuccess(m_response);
     }
 
 private:
     WebServiceWorkerResponse& m_response;
 };
 
 TEST_F(CacheStorageTest, MatchResponseTest)
 {
     ScriptState::Scope scope(scriptState());
     OwnPtr<ScopedFetcherForTests> fetcher = adoptPtr(new ScopedFetcherForTests());
@@ skipping 15 matching lines @@
 }
 
 class KeysTestCache : public NotImplementedErrorCache {
 public:
     KeysTestCache(WebVector<WebServiceWorkerRequest>& requests)
         : m_requests(requests) { }
 
     void dispatchKeys(CacheWithRequestsCallbacks* callbacks, const WebServiceWorkerRequest* webRequest, const QueryParams& queryParams) override
     {
         OwnPtr<CacheWithRequestsCallbacks> ownedCallbacks(adoptPtr(callbacks));
-        return callbacks->onSuccess(&m_requests);
+        return callbacks->onSuccess(m_requests);
     }
 
 private:
     WebVector<WebServiceWorkerRequest>& m_requests;
 };
 
 TEST_F(CacheStorageTest, KeysResponseTest)
 {
     ScriptState::Scope scope(scriptState());
     OwnPtr<ScopedFetcherForTests> fetcher = adoptPtr(new ScopedFetcherForTests());
@@ skipping 24 matching lines @@
 }
 
 class MatchAllAndBatchTestCache : public NotImplementedErrorCache {
 public:
     MatchAllAndBatchTestCache(WebVector<WebServiceWorkerResponse>& responses)
         : m_responses(responses) { }
 
     void dispatchMatchAll(CacheWithResponsesCallbacks* callbacks, const WebServiceWorkerRequest& webRequest, const QueryParams& queryParams) override
     {
         OwnPtr<CacheWithResponsesCallbacks> ownedCallbacks(adoptPtr(callbacks));
-        return callbacks->onSuccess(&m_responses);
+        return callbacks->onSuccess(m_responses);
     }
 
     void dispatchBatch(CacheBatchCallbacks* callbacks, const WebVector<BatchOperation>& batchOperations) override
     {
         OwnPtr<CacheBatchCallbacks> ownedCallbacks(adoptPtr(callbacks));
         return callbacks->onSuccess();
     }
 
 private:
     WebVector<WebServiceWorkerResponse>& m_responses;
@@ skipping 67 matching lines @@
 
     ScriptPromise addResult = cache->add(scriptState(), requestToRequestInfo(request), exceptionState());
 
     EXPECT_EQ(kNotImplementedString, getRejectString(addResult));
     EXPECT_EQ(1, fetcher->fetchCount());
     EXPECT_EQ("dispatchBatch", testCache->getAndClearLastErrorWebCacheMethodCalled());
 }
 
 } // namespace
 } // namespace blink