Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: third_party/WebKit/LayoutTests/http/tests/inspector/service-workers/service-workers-test.js

Issue 2207163002: [DevTools] Removed InspectorTest.invokePageFunctionPromise (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: a Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/LayoutTests/http/tests/inspector/service-workers/service-workers-test.js
diff --git a/third_party/WebKit/LayoutTests/http/tests/inspector/service-workers/service-workers-test.js b/third_party/WebKit/LayoutTests/http/tests/inspector/service-workers/service-workers-test.js
index 4b78f61a63e3c27a5c3745ef21f772f869cb7831..d7288116ae3d08f88c890accb50da550ac0abf2d 100644
--- a/third_party/WebKit/LayoutTests/http/tests/inspector/service-workers/service-workers-test.js
+++ b/third_party/WebKit/LayoutTests/http/tests/inspector/service-workers/service-workers-test.js
@@ -2,17 +2,17 @@ var initialize_ServiceWorkersTest = function() {
InspectorTest.registerServiceWorker = function(script, scope)
{
- return InspectorTest.invokePageFunctionPromise("registerServiceWorker", [script, scope]);
+ return InspectorTest.callFunctionInPageAsync("registerServiceWorker", [ script, scope ]);
}
InspectorTest.unregisterServiceWorker = function(scope)
{
- return InspectorTest.invokePageFunctionPromise("unregisterServiceWorker", [scope]);
+ return InspectorTest.callFunctionInPageAsync("unregisterServiceWorker", [ scope ]);
}
InspectorTest.postToServiceWorker = function(scope, message)
{
- return InspectorTest.invokePageFunctionPromise("postToServiceWorker", [scope, message]);
+ return InspectorTest.evaluateInPagePromise("postToServiceWorker(\"" + scope + "\",\"" + message + "\")");
}
InspectorTest.waitForServiceWorker = function(callback)
@@ -52,30 +52,21 @@ InspectorTest.deleteServiceWorkerRegistration = function(scope)
var registrations = {};
-function registerServiceWorker(resolve, reject, script, scope)
+function registerServiceWorker(script, scope)
{
- navigator.serviceWorker.register(script, {scope: scope})
- .then(function(reg) {
- registrations[scope] = reg;
- resolve();
- }, reject);
+ return navigator.serviceWorker.register(script, {scope: scope})
+ .then((reg) => registrations[scope] = reg);
}
-function postToServiceWorker(resolve, reject, scope, message)
+function postToServiceWorker(scope, message)
{
registrations[scope].active.postMessage(message);
- resolve();
}
-function unregisterServiceWorker(resolve, reject, scope)
+function unregisterServiceWorker(scope)
{
var registration = registrations[scope];
- if (!registration) {
- reject("ServiceWorker for " + scope + " is not registered");
- return;
- }
- registration.unregister().then(function() {
- delete registrations[scope];
- resolve();
- }, reject);
+ if (!registration)
+ return Promise.reject("ServiceWorker for " + scope + " is not registered");
+ return registration.unregister().then(() => delete registrations[scope]);
}

Powered by Google App Engine
This is Rietveld 408576698