Revert of Partial implementation of subscription restrictions.

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';
 
 var resultQueue = new ResultQueue();
 var pushSubscription = null;
 
-// NIST P-256 public key made available to tests. Must be an uncompressed
-// point in accordance with SEC1 2.3.3.
-var applicationServerKey = new Uint8Array([
-  0x04, 0x55, 0x52, 0x6A, 0xA5, 0x6E, 0x8E, 0xAA, 0x47, 0x97, 0x36, 0x10, 0xC1,
-  0x66, 0x3C, 0x1E, 0x65, 0xBF, 0xA1, 0x7B, 0xEE, 0x48, 0xC9, 0xC6, 0xBB, 0xBF,
-  0x02, 0x18, 0x53, 0x72, 0x1D, 0x0C, 0x7B, 0xA9, 0xE3, 0x11, 0xB7, 0x03, 0x52,
-  0x21, 0xD3, 0x71, 0x90, 0x13, 0xA8, 0xC1, 0xCF, 0xED, 0x20, 0xF7, 0x1F, 0xD1,
-  0x7F, 0xF2, 0x76, 0xB6, 0x01, 0x20, 0xD8, 0x35, 0xA5, 0xD9, 0x3C, 0x43, 0xFD
-]);
-
 var pushSubscriptionOptions = {
   userVisibleOnly: true
 };
 
 // Sends data back to the test. This must be in response to an earlier
 // request, but it's ok to respond asynchronously. The request blocks until
 // the response is sent.
 function sendResultToTest(result) {
   console.log('sendResultToTest: ' + result);
   if (window.domAutomationController) {
@@ skipping 79 matching lines @@
 function swapManifestNoSenderId() {
   var element = document.querySelector('link[rel="manifest"]');
   if (element) {
     element.href = 'manifest_no_sender_id.json';
     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 subscribePushWithoutKey() {
-  navigator.serviceWorker.ready.then(function(swRegistration) {
-    return swRegistration.pushManager.subscribe(
-        pushSubscriptionOptions)
-        .then(function(subscription) {
-          pushSubscription = subscription;
-          sendResultToTest(subscription.endpoint);
-        });
-  }).catch(sendErrorToTest);
-}
-
 function subscribePush() {
   navigator.serviceWorker.ready.then(function(swRegistration) {
-    pushSubscriptionOptions.applicationServerKey = applicationServerKey.buffer;
     return swRegistration.pushManager.subscribe(pushSubscriptionOptions)
         .then(function(subscription) {
           pushSubscription = subscription;
-          sendResultToTest(subscription.endpoint);
-        });
-  }).catch(sendErrorToTest);
-}
-
-function subscribePushBadKey() {
-  navigator.serviceWorker.ready.then(function(swRegistration) {
-    var invalidApplicationServerKey = Uint8Array.from(applicationServerKey);
-    invalidApplicationServerKey[0] = 0x05;
-    pushSubscriptionOptions.applicationServerKey =
-        invalidApplicationServerKey.buffer;
-    return swRegistration.pushManager.subscribe(pushSubscriptionOptions)
-        .then(function(subscription) {
-          pushSubscription = subscription;
           sendResultToTest(subscription.endpoint);
         });
   }).catch(sendErrorToTest);
 }
 
 function GetP256dh() {
   navigator.serviceWorker.ready.then(function(swRegistration) {
     return swRegistration.pushManager.getSubscription()
         .then(function(subscription) {
           sendResultToTest(btoa(String.fromCharCode.apply(null,
@@ skipping 39 matching lines @@
     sendResultToTest(subscription ? 'true - subscribed'
                                   : 'false - not subscribed');
   }).catch(sendErrorToTest);
 }
 
 navigator.serviceWorker.addEventListener('message', function(event) {
   var message = JSON.parse(event.data);
   if (message.type == 'push')
     resultQueue.push(message.data);
 }, false);