[Background Sync] Align exposed API with spec

content/test/data/background_sync/background_sync_test_helpers.js

 // Copyright 2015 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';
 
 var resultQueue = new ResultQueue();
 var registrationReference = null;
 
 // Sends data back to the test. This must be in response to an earlier
@@ skipping 17 matching lines @@
     })
     .then(function(swRegistration) {
       sendResultToTest('ok - service worker registered');
     })
     .catch(sendErrorToTest);
 }
 
 function registerOneShot(tag) {
   navigator.serviceWorker.ready
     .then(function(swRegistration) {
-      return swRegistration.sync.register({'tag': tag});
+      return swRegistration.sync.register(tag);
     })
-    .then(function(syncRegistration) {
+    .then(function() {
       sendResultToTest('ok - ' + tag + ' registered');
     })
     .catch(sendErrorToTest);
 }
 
 function registerOneShotFromServiceWorker(tag) {
   navigator.serviceWorker.ready
     .then(function(swRegistration) {
       swRegistration.active.postMessage({action: 'registerOneShot', tag: tag});
       sendResultToTest('ok - ' + tag + ' register sent to SW');
     })
     .catch(sendErrorToTest);
 }
 
-function unregisterOneShot(tag) {
-  navigator.serviceWorker.ready
-    .then(function(swRegistration) {
-      return swRegistration.sync.getRegistration(tag);
-    })
-    .then(function(syncRegistration) {
-      if (!syncRegistration) {
-        sendResultToTest('error - ' + tag + ' not found');
-        return;
-      }
-      return syncRegistration.unregister();
-    })
-    .then(function() {
-      sendResultToTest('ok - ' + tag + ' unregistered');
-    })
-    .catch(sendErrorToTest);
-}
-
-function unregisterOneShotTwice(tag) {
-  navigator.serviceWorker.ready
-    .then(function(swRegistration) {
-      return swRegistration.sync.getRegistration(tag);
-    })
-    .then(function(syncRegistration) {
-      if (!syncRegistration) {
-        sendResultToTest('error - ' + tag + ' not found');
-        return;
-      }
-      return syncRegistration.unregister();
-    })
-    .then(function() {
-      return syncRegistration.unregister();
-    })
-    .then(sendErrorToTest, function() {
-      sendResultToTest('ok - ' + tag + ' failed to unregister twice');
-    })
-    .catch(sendErrorToTest);
-}
-
 function getRegistrationOneShot(tag) {
   navigator.serviceWorker.ready
     .then(function(swRegistration) {
-      return swRegistration.sync.getRegistration(tag);
+      return swRegistration.sync.getTags();
     })
-    .then(function(syncRegistration) {
-      if (!syncRegistration) {
+    .then(function(tags) {
+      if (tags.indexOf(tag) >= 0) {
+        sendResultToTest('ok - ' + tag + ' found');
+      } else {
         sendResultToTest('error - ' + tag + ' not found');
         return;
       }
-      sendResultToTest('ok - ' + tag + ' found');
     })
     .catch(sendErrorToTest);
 }
 
 function getRegistrationOneShotFromServiceWorker(tag) {
   navigator.serviceWorker.ready
     .then(function(swRegistration) {
       swRegistration.active.postMessage(
           {action: 'getRegistrationOneShot', tag: tag});
       sendResultToTest('ok - getRegistration sent to SW');
     })
     .catch(sendErrorToTest);
 }
 
 function getRegistrationsOneShot(tag) {
   navigator.serviceWorker.ready
     .then(function(swRegistration) {
-      return swRegistration.sync.getRegistrations();
+      return swRegistration.sync.getTags();
     })
-    .then(function(syncRegistrations) {
-      var tags = syncRegistrations.map(function(syncRegistration) {
-        return syncRegistration.tag;
-      });
+    .then(function(tags) {
       sendResultToTest('ok - ' + tags.toString());
     })
     .catch(sendErrorToTest);
 }
 
 function getRegistrationsOneShotFromServiceWorker() {
   navigator.serviceWorker.ready
     .then(function(swRegistration) {
       swRegistration.active.postMessage({action: 'getRegistrationsOneShot'});
       sendResultToTest('ok - getRegistrations sent to SW');
@@ skipping 12 matching lines @@
 
 function rejectDelayedOneShot() {
   navigator.serviceWorker.ready
     .then(function(swRegistration) {
       swRegistration.active.postMessage({action: 'rejectDelayedOneShot'});
       sendResultToTest('ok - delay rejecting');
     })
     .catch(sendErrorToTest);
 }
 
-function notifyWhenFinishedOneShot(tag) {
-  navigator.serviceWorker.ready
-    .then(function(swRegistration) {
-      swRegistration.active.postMessage(
-          {action: 'notifyWhenFinished', tag: tag});
-    })
-    .catch(sendErrorToTest);
-}
-
-function notifyWhenFinishedImmediateOneShot(tag) {
-  if (registrationReference == null) {
-    sendResultToTest('error - must call storeRegistration first');
-    return;
-  }
-
-  registrationReference.finished
-    .then(function(success) {
-      sendResultToTest('ok - ' + registrationReference.tag +
-                       ' result: true')
-    }, function(err) {
-      sendResultToTest('ok - ' + registrationReference.tag +
-                       ' result: false')
-    })
-    .catch(sendErrorToTest)
-}
-
-
-function storeRegistration(tag) {
-  navigator.serviceWorker.ready
-    .then(function(swRegistration) {
-      return swRegistration.sync.getRegistration(tag);
-    })
-    .then(function(syncRegistration) {
-      registrationReference = syncRegistration;

[jkarlin, 2015/11/13 01:32:18]

Delete var registrationReference at the top of the file

[iclelland, 2015/11/13 15:26:19]

Good catch, thanks. Done.

-      sendResultToTest('ok - ' + tag + ' stored');
-    })
-    .catch(sendErrorToTest);
-}
 
 // Queue storing asynchronous results received from the Service Worker. Results
 // are sent to the test when requested.
 function ResultQueue() {
   // Invariant: this.queue.length == 0 || this.pendingGets == 0
   this.queue = [];
   this.pendingGets = 0;
 }
 
 // Adds a data item to the queue. Will be sent to the test if there are
@@ skipping 21 matching lines @@
 // available, otherwise sends null.
 ResultQueue.prototype.popImmediately = function() {
   sendResultToTest(this.queue.length ? this.queue.pop() : null);
 };
 
 navigator.serviceWorker.addEventListener('message', function(event) {
   var message = event.data;
   if (message.type == 'sync' || message.type === 'register')
     resultQueue.push(message.data);
 }, false);