Push API: Validate storage before returning cached subscriptions

chrome/browser/push_messaging/push_messaging_app_identifier.h

Index: chrome/browser/push_messaging/push_messaging_app_identifier.h
diff --git a/chrome/browser/push_messaging/push_messaging_app_identifier.h b/chrome/browser/push_messaging/push_messaging_app_identifier.h
index bfcc681f429b0a36784d6a1365d85938f8f52a59..689fb2640b31d46d75992e3f3197955e3c2a9446 100644
--- a/chrome/browser/push_messaging/push_messaging_app_identifier.h
+++ b/chrome/browser/push_messaging/push_messaging_app_identifier.h
@@ -99,8 +99,19 @@ class PushMessagingAppIdentifier {
 
  private:
   friend class PushMessagingAppIdentifierTest;
+  friend class PushMessagingBrowserTest;
   FRIEND_TEST_ALL_PREFIXES(PushMessagingAppIdentifierTest, FindLegacy);
 
+  // Generates a new app identifier for legacy GCM (not modern InstanceID).
+  static PushMessagingAppIdentifier LegacyGenerateForTesting(
+      const GURL& origin,
+      int64_t service_worker_registration_id);
+
+  static PushMessagingAppIdentifier GenerateInternal(
+      const GURL& origin,
+      int64_t service_worker_registration_id,
+      bool use_instance_id);
+
   // Constructs an invalid app identifier.
   PushMessagingAppIdentifier();
   // Constructs a valid app identifier.