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

chrome/test/data/push_messaging/push_test.js

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 9a1336067db956d91f95e0205b977dca81d08427..4c7fb761c3b01e57f6f801471301a57652d8dc08 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,16 @@ 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(
-        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()
         .then(function(subscription) {
           sendResultToTest(subscription.endpoint);
         });
@@ -104,8 +108,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);
         });
@@ -116,9 +122,10 @@ function documentSubscribePushBadKey() {
   navigator.serviceWorker.ready.then(function(swRegistration) {
     var invalidApplicationServerKey = new Uint8Array(300);
     invalidApplicationServerKey.fill('0x05', 1, 300);
-    pushSubscriptionOptions.applicationServerKey =
-        invalidApplicationServerKey.buffer;
-    return swRegistration.pushManager.subscribe(pushSubscriptionOptions)
+    return swRegistration.pushManager.subscribe({
+          userVisibleOnly: true,
+          applicationServerKey: invalidApplicationServerKey.buffer
+        })
         .then(function(subscription) {
           sendResultToTest(subscription.endpoint);
         });
@@ -149,7 +156,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);
         });