Push API: Validate storage before returning cached subscriptions

content/public/common/push_messaging_status.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_PUSH_MESSAGING_STATUS_H_
 #define CONTENT_PUBLIC_COMMON_PUSH_MESSAGING_STATUS_H_
 
 namespace content {
 
 // Push registration success/error codes for internal use & reporting in UMA.
@@ skipping 43 matching lines @@
   PUSH_REGISTRATION_STATUS_PUBLIC_KEY_UNAVAILABLE = 11,
 
   // Registration failed because the manifest could not be retrieved or was
   // empty.
   PUSH_REGISTRATION_STATUS_MANIFEST_EMPTY_OR_MISSING = 12,
 
   // Registration failed because a subscription with a different sender id
   // already exists.
   PUSH_REGISTRATION_STATUS_SENDER_ID_MISMATCH = 13,
 
+  // Registration failed because storage was corrupt. It will be retried
+  // automatically after unsubscribing to fix the corruption.
+  PUSH_REGISTRATION_STATUS_STORAGE_CORRUPT = 14,
+
   // NOTE: Do not renumber these as that would confuse interpretation of
   // previously logged data. When making changes, also update the enum list
   // in tools/metrics/histograms/histograms.xml to keep it in sync, and
   // update PUSH_REGISTRATION_STATUS_LAST below.
 
-  PUSH_REGISTRATION_STATUS_LAST = PUSH_REGISTRATION_STATUS_SENDER_ID_MISMATCH
+  PUSH_REGISTRATION_STATUS_LAST = PUSH_REGISTRATION_STATUS_STORAGE_CORRUPT
 };
 
 // Push unregistration reason for reporting in UMA. Enum values can be added,
 // but must never be renumbered or deleted and reused.
 enum PushUnregistrationReason {
   // Should never happen.
   PUSH_UNREGISTRATION_REASON_UNKNOWN = 0,
 
   // Unregistering because the website called the unsubscribe API.
   PUSH_UNREGISTRATION_REASON_JAVASCRIPT_API = 1,
 
   // Unregistering because the user manually revoked permission.
   PUSH_UNREGISTRATION_REASON_PERMISSION_REVOKED = 2,
 
   // Automatic - incoming message's app id was unknown.
   PUSH_UNREGISTRATION_REASON_DELIVERY_UNKNOWN_APP_ID = 3,
 
   // Automatic - incoming message's origin no longer has permission.
   PUSH_UNREGISTRATION_REASON_DELIVERY_PERMISSION_DENIED = 4,
 
   // Automatic - incoming message's service worker was not found.
   PUSH_UNREGISTRATION_REASON_DELIVERY_NO_SERVICE_WORKER = 5,
 
   // Automatic - GCM Store reset due to corruption.
   PUSH_UNREGISTRATION_REASON_GCM_STORE_RESET = 6,
 
   // Unregistering because the service worker was unregistered.
   PUSH_UNREGISTRATION_REASON_SERVICE_WORKER_UNREGISTERED = 7,
 
+  // Website called subscribe API and the stored subscription was corrupt, so
+  // it is being unsubscribed in order to attempt a clean subscription.
+  PUSH_UNREGISTRATION_REASON_SUBSCRIBE_STORAGE_CORRUPT = 8,
+
+  // Website called getSubscription API and the stored subscription was corrupt.
+  PUSH_UNREGISTRATION_REASON_GET_SUBSCRIPTION_STORAGE_CORRUPT = 9,
+
   // NOTE: Do not renumber these as that would confuse interpretation of
   // previously logged data. When making changes, also update the enum list
   // in tools/metrics/histograms/histograms.xml to keep it in sync, and
   // update PUSH_UNREGISTRATION_REASON_LAST below.
 
   PUSH_UNREGISTRATION_REASON_LAST =
-      PUSH_UNREGISTRATION_REASON_SERVICE_WORKER_UNREGISTERED
+      PUSH_UNREGISTRATION_REASON_GET_SUBSCRIPTION_STORAGE_CORRUPT
 };
 
 // Push unregistration success/error codes for internal use & reporting in UMA.
 // Enum values can be added, but must never be renumbered or deleted and reused.
 enum PushUnregistrationStatus {
   // The unregistration was successful.
   PUSH_UNREGISTRATION_STATUS_SUCCESS_UNREGISTERED = 0,
 
   // Unregistration was unnecessary, as the registration was not found.
   PUSH_UNREGISTRATION_STATUS_SUCCESS_WAS_NOT_REGISTERED = 1,
@@ skipping 38 matching lines @@
   // Getting the registration failed because we failed to read from storage.
   PUSH_GETREGISTRATION_STATUS_STORAGE_ERROR = 2,
 
   // Getting the registration failed because there is no push registration.
   PUSH_GETREGISTRATION_STATUS_REGISTRATION_NOT_FOUND = 3,
 
   // Getting the registration failed because the push service isn't available in
   // incognito, but we tell JS registration not found to not reveal incognito.
   PUSH_GETREGISTRATION_STATUS_INCOGNITO_REGISTRATION_NOT_FOUND = 4,
 
-  // Registration failed because the public key could not be retrieved.
-  PUSH_GETREGISTRATION_STATUS_PUBLIC_KEY_UNAVAILABLE = 5,
+  // Getting the registration failed because public key could not be retrieved.
+  // PUSH_GETREGISTRATION_STATUS_PUBLIC_KEY_UNAVAILABLE = 5,
+
+  // Getting the registration failed because storage was corrupt.
+  PUSH_GETREGISTRATION_STATUS_STORAGE_CORRUPT = 6,
 
   // NOTE: Do not renumber these as that would confuse interpretation of
   // previously logged data. When making changes, also update the enum list
   // in tools/metrics/histograms/histograms.xml to keep it in sync, and
   // update PUSH_GETREGISTRATION_STATUS_LAST below.
 
-  PUSH_GETREGISTRATION_STATUS_LAST =
-      PUSH_GETREGISTRATION_STATUS_PUBLIC_KEY_UNAVAILABLE
+  PUSH_GETREGISTRATION_STATUS_LAST = PUSH_GETREGISTRATION_STATUS_STORAGE_CORRUPT
 };
 
 // Push message event success/error codes for internal use & reporting in UMA.
 // Enum values can be added, but must never be renumbered or deleted and reused.
 enum PushDeliveryStatus {
   // The message was successfully delivered.
   PUSH_DELIVERY_STATUS_SUCCESS = 0,
 
   // The message could not be delivered because the app id was unknown.
   PUSH_DELIVERY_STATUS_UNKNOWN_APP_ID = 2,
@@ skipping 51 matching lines @@
       PUSH_USER_VISIBLE_STATUS_REQUIRED_BUT_NOT_SHOWN_GRACE_EXCEEDED
 };
 
 const char* PushRegistrationStatusToString(PushRegistrationStatus status);
 
 const char* PushUnregistrationStatusToString(PushUnregistrationStatus status);
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_PUSH_MESSAGING_STATUS_H_