CallbackPromiseAdapter types should be more compatible with WebCallbacks (3/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 68 matching lines @@
 
 PassOwnPtr<WebServiceWorkerCacheStorage> assertCacheStorageAndNameForId(ErrorString* errorString, const String& cacheId, String* cacheName)
 {
     String securityOrigin;
     if (!parseCacheId(errorString, cacheId, &securityOrigin, cacheName)) {
         return nullptr;
     }
     return assertCacheStorage(errorString, securityOrigin);
 }
 
-CString serviceWorkerCacheErrorString(WebServiceWorkerCacheError* error)
+CString serviceWorkerCacheErrorString(WebServiceWorkerCacheError error)
 {
-    switch (*error) {
+    switch (error) {
     case WebServiceWorkerCacheErrorNotImplemented:
         return CString("not implemented.");
         break;
     case WebServiceWorkerCacheErrorNotFound:
         return CString("not found.");
         break;
     case WebServiceWorkerCacheErrorExists:
         return CString("cache already exists.");
         break;
     default:
@@ skipping 24 matching lines @@
                 .setSecurityOrigin(m_securityOrigin)
                 .setCacheName(name)
                 .setCacheId(buildCacheId(m_securityOrigin, name));
             array->addItem(entry);
         }
         m_callback->sendSuccess(array);
     }
 
     void onError(WebServiceWorkerCacheError* error)
     {
-        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 77 matching lines @@
     }
     ~GetCacheResponsesForRequestData() override { }
 
     void onSuccess(WebServiceWorkerResponse* response)
     {
         m_accumulator->addRequestResponsePair(m_request, *response);
     }
 
     void onError(WebServiceWorkerCacheError* error)
     {
-        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 {
@@ skipping 19 matching lines @@
 
         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)
     {
-        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)
     {
         auto* cacheRequest = new GetCacheKeysForRequestData(m_params, adoptPtr(cache), m_callback);
         cache->dispatchKeys(cacheRequest, nullptr, WebServiceWorkerCache::QueryParams());
     }
 
     void onError(WebServiceWorkerCacheError* error)
     {
-        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()
     {
         m_callback->sendSuccess();
     }
 
     void onError(WebServiceWorkerCacheError* error)
     {
-        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()
     {
         m_callback->sendSuccess();
     }
 
-    void onError(WebPassOwnPtr<WebServiceWorkerCacheError> e)
+    void onError(WebServiceWorkerCacheError error)
     {
-        OwnPtr<WebServiceWorkerCacheError> error = e.release();
-        m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(error.get()).data()));
+        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);
 
@@ skipping 12 matching lines @@
         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));
     }
 
     void onError(WebServiceWorkerCacheError* error)
     {
-        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 51 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