Push API: rename to endpoint and registrationId [1/3]

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 pushData = new FutureData();
 
 // 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
@@ skipping 65 matching lines @@
       sendResultToTest('service worker unregistration status: ' + result);
     })
   }).catch(sendErrorToTest);
 }
 
 function removeManifest() {
   var element = document.querySelector('link[rel="manifest"]');
   if (element) {
     element.parentNode.removeChild(element);
     sendResultToTest('manifest removed');
-  } else
-  sendResultToTest('unable to find manifest element');
+  } else {
+    sendResultToTest('unable to find manifest element');
+  }
 }
 
 function registerPush() {
   navigator.serviceWorker.ready.then(function(swRegistration) {
-    // TODO(mvanouwerkerk): Cleanup once the final API is exposed.
-    var pushManager = swRegistration.pushManager || navigator.push;
-    return pushManager.register().then(function(pushRegistration) {
-      sendResultToTest(pushRegistration.pushEndpoint + ' - ' +
-          pushRegistration.pushRegistrationId);
-    });
+    return swRegistration.pushManager.register()
+        .then(function(pushRegistration) {
+          // TODO: Cleanup once the final API is exposed.
+          var endpoint = pushRegistration.endpoint ||
+                         pushRegistration.pushEndpoint;
+          var registrationId = pushRegistration.registrationId ||
+                               pushRegistration.pushRegistrationId;
+          sendResultToTest(endpoint + ' - ' + registrationId);
+        });
   }).catch(sendErrorToTest);
 }
 
 function hasPermission() {
   navigator.serviceWorker.ready.then(function(swRegistration) {
-    // TODO(mvanouwerkerk): Cleanup once the final API is exposed.
-    var pushManager = swRegistration.pushManager || navigator.push;
-    return pushManager.hasPermission().then(function(permission) {
-      sendResultToTest('permission status - ' + permission);
-    });
+    return swRegistration.pushManager.hasPermission()
+        .then(function(permission) {
+          sendResultToTest('permission status - ' + permission);
+        });
   }).catch(sendErrorToTest);
 }
 
 function isControlled() {
   if (navigator.serviceWorker.controller) {
     sendResultToTest('true - is controlled');
   } else {
     sendResultToTest('false - is not controlled');
   }
 }
 
 addEventListener('message', function(event) {
   var message = JSON.parse(event.data);
   if (message.type == 'push') {
     pushData.set(message.data);
   }
 }, false);