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

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 2998b199f4601ff712a093575cb8d444c917d8b0..1076f3fb99dc3a4a96c489b3daf6adb8a7e5bc23 100644
--- a/chrome/test/data/push_messaging/push_test.js
+++ b/chrome/test/data/push_messaging/push_test.js
@@ -83,28 +83,31 @@ function removeManifest() {
   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);
 }