Push API: Validate storage before returning cached subscriptions

content/common/push_messaging.mojom

 // Copyright 2017 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.
 
 module content.mojom;
 
 import "url/mojo/url.mojom";
 
 // TODO(heke): The type-mapping struct and enums are duplicately defined. Need
 // to remove/replace those defined in content or blink namespace.
@@ skipping 50 matching lines @@
   PUBLIC_KEY_UNAVAILABLE = 11,
 
   // Registration failed because the manifest could not be retrieved or was
   // empty.
   MANIFEST_EMPTY_OR_MISSING = 12,
 
   // Registration failed because a subscription with a different sender id
   // already exists.
   SENDER_ID_MISMATCH = 13,
 
+  // Registration failed because storage was corrupt. It will be retried
+  // automatically after unsubscribing to fix the corruption.
+  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 LAST below.
 
-  LAST = SENDER_ID_MISMATCH
+  LAST = STORAGE_CORRUPT
 };
 
 enum PushErrorType {
   ABORT = 0,
   NETWORK = 1,
   NONE = 2,
   NOT_ALLOWED = 3,
   NOT_FOUND = 4,
   NOT_SUPPORTED = 5,
   INVALID_STATE = 6,
@@ skipping 12 matching lines @@
   // Getting the registration failed because we failed to read from storage.
   STORAGE_ERROR = 2,
 
   // Getting the registration failed because there is no push registration.
   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.
   INCOGNITO_REGISTRATION_NOT_FOUND = 4,
 
-  // Registration failed because the public key could not be retrieved.
-  PUBLIC_KEY_UNAVAILABLE = 5,
+  // Getting the registration failed because public key could not be retrieved.
+  // PUBLIC_KEY_UNAVAILABLE = 5,
+
+  // Getting the registration failed because storage was corrupt.
+  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 LAST below.
 
-  LAST = PUBLIC_KEY_UNAVAILABLE
+  LAST = STORAGE_CORRUPT
 };
 
 enum PushPermissionStatus {
   GRANTED = 0,
   DENIED = 1,
   PROMPT = 2,
   LAST = PROMPT
 };
 
 interface PushMessaging {
@@ skipping 22 matching lines @@
                      array<uint8>? auth);
 
   // We use the value of |error_type| as a flag. If |error_type| == NONE, it
   // means no error and returns |status|. Else, it means there is an error and
   // returns |error_type|.
   GetPermissionStatus(int64 service_worker_registration_id,
                       bool user_visible)
                      => (PushErrorType error_type,
                          PushPermissionStatus status);
 };