Rename "register" -> "subscribe" in the Push Messaging code.

content/public/common/push_messaging_status.cc

Index: content/public/common/push_messaging_status.cc
diff --git a/content/public/common/push_messaging_status.cc b/content/public/common/push_messaging_status.cc
index 9b4a42138e6acadee9eba552ca704292818010d2..003a4d76a46cecf72e647dbd2b0a45ee35f5064c 100644
--- a/content/public/common/push_messaging_status.cc
+++ b/content/public/common/push_messaging_status.cc
@@ -8,73 +8,77 @@
 
 namespace content {
 
-const char* PushRegistrationStatusToString(PushRegistrationStatus status) {
+// TODO(peter): Finish the registration -> subscription rename by changing the
+// following string values as well. These are Web exposed, however, so have to
+// be considered with more care. https://crbug.com/446883.
+
+const char* PushSubscriptionStatusToString(PushSubscriptionStatus status) {
   switch (status) {
-    case PUSH_REGISTRATION_STATUS_SUCCESS_FROM_PUSH_SERVICE:
+    case PUSH_SUBSCRIPTION_STATUS_SUCCESS_FROM_PUSH_SERVICE:
       return "Registration successful - from push service";
 
-    case PUSH_REGISTRATION_STATUS_NO_SERVICE_WORKER:
+    case PUSH_SUBSCRIPTION_STATUS_NO_SERVICE_WORKER:
       return "Registration failed - no Service Worker";

[johnme, 2015/05/07 13:31:26]

Please also rename all these strings. Since the web-facing API is
subscribe/unsubscribe, the error messages should talk about
subscription/unsubscription as well.

 
-    case PUSH_REGISTRATION_STATUS_SERVICE_NOT_AVAILABLE:
+    case PUSH_SUBSCRIPTION_STATUS_SERVICE_NOT_AVAILABLE:
       return "Registration failed - push service not available";
 
-    case PUSH_REGISTRATION_STATUS_LIMIT_REACHED:
+    case PUSH_SUBSCRIPTION_STATUS_LIMIT_REACHED:
       return "Registration failed - registration limit has been reached";
 
-    case PUSH_REGISTRATION_STATUS_PERMISSION_DENIED:
+    case PUSH_SUBSCRIPTION_STATUS_PERMISSION_DENIED:
       return "Registration failed - permission denied";
 
-    case PUSH_REGISTRATION_STATUS_SERVICE_ERROR:
+    case PUSH_SUBSCRIPTION_STATUS_SERVICE_ERROR:
       return "Registration failed - push service error";
 
-    case PUSH_REGISTRATION_STATUS_NO_SENDER_ID:
+    case PUSH_SUBSCRIPTION_STATUS_NO_SENDER_ID:
       return "Registration failed - no sender id provided";
 
-    case PUSH_REGISTRATION_STATUS_STORAGE_ERROR:
+    case PUSH_SUBSCRIPTION_STATUS_STORAGE_ERROR:
       return "Registration failed - storage error";
 
-    case PUSH_REGISTRATION_STATUS_SUCCESS_FROM_CACHE:
+    case PUSH_SUBSCRIPTION_STATUS_SUCCESS_FROM_CACHE:
       return "Registration successful - from cache";
 
-    case PUSH_REGISTRATION_STATUS_NETWORK_ERROR:
+    case PUSH_SUBSCRIPTION_STATUS_NETWORK_ERROR:
       return "Registration failed - could not connect to push server";
 
-    case PUSH_REGISTRATION_STATUS_INCOGNITO_PERMISSION_DENIED:
+    case PUSH_SUBSCRIPTION_STATUS_INCOGNITO_PERMISSION_DENIED:
       // We split this out for UMA, but it must be indistinguishable to JS.
-      return PushRegistrationStatusToString(
-          PUSH_REGISTRATION_STATUS_PERMISSION_DENIED);
+      return PushSubscriptionStatusToString(
+          PUSH_SUBSCRIPTION_STATUS_PERMISSION_DENIED);
   }
   NOTREACHED();
   return "";
 }
 
-const char* PushUnregistrationStatusToString(PushUnregistrationStatus status) {
+const char* PushUnsubscriptionStatusToString(PushUnsubscriptionStatus status) {
   switch (status) {
-    case PUSH_UNREGISTRATION_STATUS_SUCCESS_UNREGISTERED:
+    case PUSH_UNSUBSCRIPTION_STATUS_SUCCESS_UNSUBSCRIBED:
       return "Unregistration successful - from push service";
 
-    case PUSH_UNREGISTRATION_STATUS_SUCCESS_WAS_NOT_REGISTERED:
+    case PUSH_UNSUBSCRIPTION_STATUS_SUCCESS_WAS_NOT_SUBSCRIBED:
       return "Unregistration successful - was not registered";
 
-    case PUSH_UNREGISTRATION_STATUS_PENDING_NETWORK_ERROR:
+    case PUSH_UNSUBSCRIPTION_STATUS_PENDING_NETWORK_ERROR:
       return "Unregistration pending - a network error occurred, but it will "
              "be retried until it succeeds";
 
-    case PUSH_UNREGISTRATION_STATUS_NO_SERVICE_WORKER:
+    case PUSH_UNSUBSCRIPTION_STATUS_NO_SERVICE_WORKER:
       return "Unregistration failed - no Service Worker";
 
-    case PUSH_UNREGISTRATION_STATUS_SERVICE_NOT_AVAILABLE:
+    case PUSH_UNSUBSCRIPTION_STATUS_SERVICE_NOT_AVAILABLE:
       return "Unregistration failed - push service not available";
 
-    case PUSH_UNREGISTRATION_STATUS_PENDING_SERVICE_ERROR:
+    case PUSH_UNSUBSCRIPTION_STATUS_PENDING_SERVICE_ERROR:
       return "Unregistration pending - a push service error occurred, but it "
              "will be retried until it succeeds";
 
-    case PUSH_UNREGISTRATION_STATUS_STORAGE_ERROR:
+    case PUSH_UNSUBSCRIPTION_STATUS_STORAGE_ERROR:
       return "Unregistration failed - storage error";
 
-    case PUSH_UNREGISTRATION_STATUS_NETWORK_ERROR:
+    case PUSH_UNSUBSCRIPTION_STATUS_NETWORK_ERROR:
       return "Unregistration failed - could not connect to push server";
   }
   NOTREACHED();