[DevTools] Removed InspectorTest.invokePageFunctionPromise

third_party/WebKit/LayoutTests/http/tests/inspector/cache-storage/cache-storage-test.js

Index: third_party/WebKit/LayoutTests/http/tests/inspector/cache-storage/cache-storage-test.js
diff --git a/third_party/WebKit/LayoutTests/http/tests/inspector/cache-storage/cache-storage-test.js b/third_party/WebKit/LayoutTests/http/tests/inspector/cache-storage/cache-storage-test.js
index ee4889ddc52b825deb46aa0159c7dfad8624e044..0c6b7a04f14f190c68292c09a96e0a7cc0353d99 100644
--- a/third_party/WebKit/LayoutTests/http/tests/inspector/cache-storage/cache-storage-test.js
+++ b/third_party/WebKit/LayoutTests/http/tests/inspector/cache-storage/cache-storage-test.js
@@ -135,44 +135,43 @@ InspectorTest.waitForCacheRefresh = function(callback)
 
 InspectorTest.createCache = function(cacheName)
 {
-    return InspectorTest.invokePageFunctionPromise("createCache", [cacheName]);
+    return InspectorTest.callFunctionInPageAsync("createCache", [ cacheName ]);
 }
 
 InspectorTest.addCacheEntry = function(cacheName, requestUrl, responseText)
 {
-    return InspectorTest.invokePageFunctionPromise("addCacheEntry", [cacheName, requestUrl, responseText]);
+    return InspectorTest.callFunctionInPageAsync("addCacheEntry", [ cacheName, requestUrl, responseText ]);
 }
 
 InspectorTest.deleteCache = function(cacheName)
 {
-    return InspectorTest.invokePageFunctionPromise("deleteCache", [cacheName]);
+    return InspectorTest.callFunctionInPageAsync("deleteCache", [ cacheName ]);
 }
 
 InspectorTest.deleteCacheEntry = function(cacheName, requestUrl)
 {
-    return InspectorTest.invokePageFunctionPromise("deleteCacheEntry", [cacheName, requestUrl]);
+    return InspectorTest.callFunctionInPageAsync("deleteCacheEntry", [ cacheName, requestUrl ]);
 }
 
 InspectorTest.clearAllCaches = function()
 {
-    return InspectorTest.invokePageFunctionPromise("clearAllCaches", []);
+    return InspectorTest.callFunctionInPageAsync("clearAllCaches");
 }
 }
 
-function onCacheStorageError(reject, e)
+function onCacheStorageError(e)
 {
     console.error("CacheStorage error: " + e);
-    reject();
 }
 
-function createCache(resolve, reject, cacheName)
+function createCache(cacheName)
 {
-    caches.open(cacheName).then(resolve).catch(onCacheStorageError.bind(this, reject));
+    return caches.open(cacheName).catch(onCacheStorageError);
 }
 
-function addCacheEntry(resolve, reject, cacheName, requestUrl, responseText)
+function addCacheEntry(cacheName, requestUrl, responseText)
 {
-    caches.open(cacheName)
+    return caches.open(cacheName)
         .then(function(cache) {
             var request = new Request(requestUrl);
             var myBlob = new Blob();
@@ -180,40 +179,26 @@ function addCacheEntry(resolve, reject, cacheName, requestUrl, responseText)
             var response = new Response(myBlob, init);
             return cache.put(request, response);
         })
-        .then(resolve)
-        .catch(onCacheStorageError.bind(this, reject));
+        .catch(onCacheStorageError);
 }
 
-function deleteCache(resolve, reject, cacheName)
+function deleteCache(cacheName)
 {
-    caches.delete(cacheName)
-        .then(function(success) {
-            if (success)
-                resolve();
-            else
-                onCacheStorageError(reject, "Could not find cache " + cacheName);
-        }).catch(onCacheStorageError.bind(this, reject));
+    return caches.delete(cacheName)
+        .then((success) => success ? undefined : onCacheStorageError("Could not find cache " + cacheName))

[dgozman, 2016/08/03 22:46:57]

This looks strange. Let's revert to previous version?

[kozy, 2016/08/03 23:48:39]

Done.

+        .catch(onCacheStorageError);
 }
 
-function deleteCacheEntry(resolve, reject, cacheName, requestUrl)
+function deleteCacheEntry(cacheName, requestUrl)
 {
-    caches.open(cacheName)
-        .then(function(cache) {
-            var request = new Request(requestUrl);
-            return cache.delete(request);
-        })
-        .then(resolve)
-        .catch(onCacheStorageError.bind(this, reject));
+    return caches.open(cacheName)
+        .then((cache) => cache.delete(new Request(requestUrl)))
+        .catch(onCacheStorageError);
 }
 
-function clearAllCaches(resolve, reject)
+function clearAllCaches()
 {
-    caches.keys()
-        .then(function(keys) {
-            return Promise.all(keys.map(function(key) {
-                return caches.delete(key);
-            }));
-        })
-        .then(resolve)
-        .catch(onCacheStorageError.bind(this, reject));
+    return caches.keys()
+        .then((keys) => Promise.all(keys.map((key) => caches.delete(key))))
+        .catch(onCacheStorageError.bind(this, undefined));
 }