Push API: Validate storage before returning cached subscriptions

chrome/browser/push_messaging/push_messaging_service_impl.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_SERVICE_IMPL_H_
 #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
 
 #include <stdint.h>
 #include <memory>
 #include <set>
@@ skipping 64 matching lines @@
   void SubscribeFromDocument(const GURL& requesting_origin,
                              int64_t service_worker_registration_id,
                              int renderer_id,
                              int render_frame_id,
                              const content::PushSubscriptionOptions& options,
                              const RegisterCallback& callback) override;
   void SubscribeFromWorker(const GURL& requesting_origin,
                            int64_t service_worker_registration_id,
                            const content::PushSubscriptionOptions& options,
                            const RegisterCallback& callback) override;
-  void GetEncryptionInfo(const GURL& origin,
-                         int64_t service_worker_registration_id,
-                         const std::string& sender_id,
-                         const EncryptionInfoCallback& callback) override;
-  void Unsubscribe(const GURL& requesting_origin,
+  void GetSubscriptionInfo(const GURL& origin,
+                           int64_t service_worker_registration_id,
+                           const std::string& sender_id,
+                           const std::string& subscription_id,
+                           const SubscriptionInfoCallback& callback) override;
+  void Unsubscribe(content::PushUnregistrationReason reason,
+                   const GURL& requesting_origin,
                    int64_t service_worker_registration_id,
                    const std::string& sender_id,
                    const UnregisterCallback&) override;
   blink::WebPushPermissionStatus GetPermissionStatus(
       const GURL& origin,
       bool user_visible) override;
   bool SupportNonVisibleMessages() override;
   void DidDeleteServiceWorkerRegistration(
       const GURL& origin,
       int64_t service_worker_registration_id) override;
@@ skipping 62 matching lines @@
                     const std::string& subscription_id,
                     instance_id::InstanceID::Result result);
 
   void DidSubscribeWithEncryptionInfo(
       const PushMessagingAppIdentifier& app_identifier,
       const RegisterCallback& callback,
       const std::string& subscription_id,
       const std::string& p256dh,
       const std::string& auth_secret);
 
-  // GetEncryptionInfo method --------------------------------------------------
+  // GetSubscriptionInfo method
+  // --------------------------------------------------

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

nit: did clang-format do this? It's now inconsistent with the rest. Also plural.

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

Done.

 
-  void DidGetEncryptionInfo(const EncryptionInfoCallback& callback,
+  void DidValidateSubscription(const std::string& app_id,
+                               const std::string& sender_id,
+                               const SubscriptionInfoCallback& callback,
+                               bool is_valid);
+
+  void DidGetEncryptionInfo(const SubscriptionInfoCallback& callback,
                             const std::string& p256dh,
                             const std::string& auth_secret) const;
 
   // Unsubscribe methods -------------------------------------------------------
 
   // |origin|, |service_worker_registration_id| and |app_id| should be provided
   // whenever they can be obtained. It's valid for |origin| to be empty and
   // |service_worker_registration_id| to be kInvalidServiceWorkerRegistrationId,
   // or for app_id to be empty, but not both at once.
   void UnsubscribeInternal(content::PushUnregistrationReason reason,
@@ skipping 85 matching lines @@
   // we can finish processing them without being interrupted.
   std::unique_ptr<ScopedKeepAlive> in_flight_keep_alive_;
 #endif
 
   base::WeakPtrFactory<PushMessagingServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PushMessagingServiceImpl);
 };
 
 #endif  // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_