CallbackPromiseAdapter types should be more compatible with WebCallbacks (3/3).

Source/modules/cachestorage/InspectorCacheStorageAgent.cpp

Index: Source/modules/cachestorage/InspectorCacheStorageAgent.cpp
diff --git a/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp b/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp
index 2caf39e94de18594101c1b5b3e897d8a29d82272..da01ce9c8940ddf0916173be24e0502134dd161e 100644
--- a/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp
+++ b/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp
@@ -86,9 +86,9 @@ PassOwnPtr<WebServiceWorkerCacheStorage> assertCacheStorageAndNameForId(ErrorStr
     return assertCacheStorage(errorString, securityOrigin);
 }
 
-CString serviceWorkerCacheErrorString(WebServiceWorkerCacheError* error)
+CString serviceWorkerCacheErrorString(WebServiceWorkerCacheError error)
 {
-    switch (*error) {
+    switch (error) {
     case WebServiceWorkerCacheErrorNotImplemented:
         return CString("not implemented.");
         break;
@@ -133,7 +133,7 @@ public:
 
     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:
@@ -231,7 +231,7 @@ public:
 
     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:
@@ -271,7 +271,7 @@ public:
 
     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:
@@ -300,7 +300,7 @@ public:
 
     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:
@@ -325,7 +325,7 @@ public:
 
     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:
@@ -347,10 +347,9 @@ public:
         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:
@@ -383,7 +382,7 @@ public:
 
     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: