Push API: Validate storage before returning cached subscriptions

chrome/browser/push_messaging/push_messaging_app_identifier.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 CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_APP_IDENTIFIER_H_
 #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_APP_IDENTIFIER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string>
@@ skipping 81 matching lines @@
     return origin_;
   }
 
   int64_t service_worker_registration_id() const {
     DCHECK(!is_null());
     return service_worker_registration_id_;
   }
 
  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.
   PushMessagingAppIdentifier(const std::string& app_id,
                              const GURL& origin,
                              int64_t service_worker_registration_id);
 
   // Validates that all the fields contain valid values.
   void DCheckValid() const;
 
   std::string app_id_;
   GURL origin_;
   int64_t service_worker_registration_id_;
 };
 
 #endif  // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_APP_IDENTIFIER_H_