Fix potential bug in push_test.js - do not cache subscription options

chrome/test/data/push_messaging/push_test.js

 // 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.
 
 'use strict';
 
 // The ResultQueue is a mechanism for passing messages back to the test
 // 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) {
   return new Promise((resolve, reject) => {
     if (reg.active) {
       resolve();
       return;
     }
 
     if (!reg.installing && !reg.waiting) {
@@ skipping 62 matching lines @@
     sendResultToTest('sender id removed from manifest');
   } else {
     sendResultToTest('unable to find manifest element');
   }
 }
 
 // This is the old style of push subscriptions which we are phasing away
 // from, where the subscription used a sender ID instead of public key.
 function documentSubscribePushWithoutKey() {
   navigator.serviceWorker.ready.then(function(swRegistration) {
-    return swRegistration.pushManager.subscribe(
-        pushSubscriptionOptions)
+    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 */)

[Peter Beverloo, 2016/10/31 18:39:56]

nit: no need to pass anything here, it defaults to an "empty" dictionary.

+        .then(function(subscription) {
+          sendResultToTest(subscription.endpoint);
+        });
   }).catch(sendErrorToTest);
 }
 
 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);
         });
   }).catch(sendErrorToTest);
 }
 
 function workerSubscribePush() {
   // Send the message to the worker for it to subscribe
   navigator.serviceWorker.controller.postMessage({command: 'workerSubscribe'});
 }
@@ skipping 10 matching lines @@
     return swRegistration.pushManager.getSubscription()
         .then(function(subscription) {
           sendResultToTest(btoa(String.fromCharCode.apply(null,
               new Uint8Array(subscription.getKey('p256dh')))));
         });
   }).catch(sendErrorToTest);
 }
 
 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);
         });
   }).catch(sendErrorToTest);
 }
 
 function isControlled() {
   if (navigator.serviceWorker.controller) {
     sendResultToTest('true - is controlled');
   } else {
@@ skipping 48 matching lines @@
   }).catch(sendErrorToTest);
 }
 
 navigator.serviceWorker.addEventListener('message', function(event) {
   var message = JSON.parse(event.data);
   if (message.type == 'push')
     resultQueue.push(message.data);
   else
     sendResultToTest(message.data);
 }, false);