Chromium Code Reviews| Index: chrome/test/data/push_messaging/push_test.js |
| diff --git a/chrome/test/data/push_messaging/push_test.js b/chrome/test/data/push_messaging/push_test.js |
| index 73907ba5f1124e4b56e410bb4b720a00c39f1463..90df2d35eab81ca890ac6d3222025db529126cb8 100644 |
| --- a/chrome/test/data/push_messaging/push_test.js |
| +++ b/chrome/test/data/push_messaging/push_test.js |
| @@ -8,10 +8,6 @@ |
| // framework. |
| var resultQueue = new ResultQueue(); |
| -var pushSubscriptionOptions = { |
| - userVisibleOnly: true |
| -}; |
| - |
| // Waits for the given ServiceWorkerRegistration to become ready. |
| // Shim for https://github.com/w3c/ServiceWorker/issues/770. |
| function swRegistrationReady(reg) { |
| @@ -94,8 +90,17 @@ function swapManifestNoSenderId() { |
| // from, where the subscription used a sender ID instead of public key. |
| function documentSubscribePushWithoutKey() { |
| navigator.serviceWorker.ready.then(function(swRegistration) { |
| + return swRegistration.pushManager.subscribe({userVisibleOnly: true}) |
| + .then(function(subscription) { |
| + sendResultToTest(subscription.endpoint); |
| + }); |
| + }).catch(sendErrorToTest); |
| +} |
| + |
| +function documentSubscribePushWithEmptyOptions() { |
| + navigator.serviceWorker.ready.then(function(swRegistration) { |
| return swRegistration.pushManager.subscribe( |
| - pushSubscriptionOptions) |
| + {} /* pushSubscriptionOptions */) |
|
Peter Beverloo
2016/10/31 18:39:56
nit: no need to pass anything here, it defaults to
|
| .then(function(subscription) { |
| sendResultToTest(subscription.endpoint); |
| }); |
| @@ -104,8 +109,10 @@ function documentSubscribePushWithoutKey() { |
| function documentSubscribePush() { |
| navigator.serviceWorker.ready.then(function(swRegistration) { |
| - pushSubscriptionOptions.applicationServerKey = kApplicationServerKey.buffer; |
| - return swRegistration.pushManager.subscribe(pushSubscriptionOptions) |
| + return swRegistration.pushManager.subscribe({ |
| + userVisibleOnly: true, |
| + applicationServerKey: kApplicationServerKey.buffer |
| + }) |
| .then(function(subscription) { |
| sendResultToTest(subscription.endpoint); |
| }); |
| @@ -136,7 +143,7 @@ function GetP256dh() { |
| function permissionState() { |
| navigator.serviceWorker.ready.then(function(swRegistration) { |
| - return swRegistration.pushManager.permissionState(pushSubscriptionOptions) |
| + return swRegistration.pushManager.permissionState({userVisibleOnly: true}) |
| .then(function(permission) { |
| sendResultToTest('permission status - ' + permission); |
| }); |