Push API: Add and cleanup UMA logging for unregister/get/delivery.

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 754587afe164e5a0ef3b610f8cdbcfd582821438..0ac03df50d7046710592b216a201cbe831fa4a46 100644
--- a/content/public/common/push_messaging_status.cc
+++ b/content/public/common/push_messaging_status.cc
@@ -36,9 +36,44 @@ const char* PushRegistrationStatusToString(PushRegistrationStatus status) {
 
     case PUSH_REGISTRATION_STATUS_SUCCESS_FROM_CACHE:
       return "Registration successful - from cache";
+
+    case PUSH_REGISTRATION_STATUS_NETWORK_ERROR:
+      return "Registration failed - could not connect to push server";
+
+    case PUSH_REGISTRATION_STATUS_INCOGNITO_SERVICE_NOT_AVAILABLE_PERMISSION_DENIED:
+      // We split this out for UMA, but it must be indistinguishable to JS.
+      return PushRegistrationStatusToString(
+          PUSH_REGISTRATION_STATUS_PERMISSION_DENIED);
+  }
+}
+
+const char* PushUnregistrationStatusToString(PushUnregistrationStatus status) {
+  switch (status) {
+    case PUSH_UNREGISTRATION_STATUS_SUCCESS_UNREGISTERED:
+      return "Unregistration successful - from push service";
+
+    case PUSH_UNREGISTRATION_STATUS_SUCCESS_WILL_RETRY_NETWORK_ERROR:
+      return "Unregistration successful - a network error occurred, but it "

[Michael van Ouwerkerk, 2015/02/20 11:05:56]

Maybe not success but pending.

[johnme, 2015/02/20 11:34:19]

Done.

+             "will be retried until it succeeds";
+
+    case PUSH_UNREGISTRATION_STATUS_SUCCESS_WAS_NOT_REGISTERED:
+      return "Unregistration successful - was not registered";
+
+    case PUSH_UNREGISTRATION_STATUS_NO_SERVICE_WORKER:
+      return "Unregistration failed - no Service Worker";
+
+    case PUSH_UNREGISTRATION_STATUS_SERVICE_NOT_AVAILABLE:
+      return "Unregistration failed - push service not available";
+
+    case PUSH_UNREGISTRATION_STATUS_SERVICE_ERROR:
+      return "Unregistration failed - push service error";
+
+    case PUSH_UNREGISTRATION_STATUS_STORAGE_ERROR:
+      return "Unregistration failed - storage error";
+
+    case PUSH_UNREGISTRATION_STATUS_NETWORK_ERROR:
+      return "Unregistration failed - could not connect to push server";
   }
-  NOTREACHED();
-  return "";
 }
 
 }  // namespace content