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 25 matching lines @@
 
   // Returns whether the modern InstanceID API should be used with this app_id
   // (rather than legacy GCM registration).
   static bool UseInstanceID(const std::string& app_id);
 
   // Generates a new app identifier, with partially random app_id.
   static PushMessagingAppIdentifier Generate(
       const GURL& origin,
       int64_t service_worker_registration_id);
 
+  // Generates a new app identifier for legacy GCM (not modern InstanceID).
+  static PushMessagingAppIdentifier LegacyGenerateForTesting(

[Peter Beverloo, 2017/03/20 23:50:13]

It's unfortunate that this has to be public. Can we perhaps make it private w/
the necessary friend declarations?

[johnme, 2017/03/30 18:36:37]

Done.

+      const GURL& origin,
+      int64_t service_worker_registration_id);
+
   // Looks up an app identifier by app_id. If not found, is_null() will be true.
   static PushMessagingAppIdentifier FindByAppId(Profile* profile,
                                                 const std::string& app_id);
 
   // Looks up an app identifier by origin & service worker registration id.
   // If not found, is_null() will be true.
   static PushMessagingAppIdentifier FindByServiceWorker(
       Profile* profile,
       const GURL& origin,
       int64_t service_worker_registration_id);
@@ skipping 38 matching lines @@
 
   int64_t service_worker_registration_id() const {
     DCHECK(!is_null());
     return service_worker_registration_id_;
   }
 
  private:
   friend class PushMessagingAppIdentifierTest;
   FRIEND_TEST_ALL_PREFIXES(PushMessagingAppIdentifierTest, FindLegacy);
 
+  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_