Push API: Validate storage before returning cached subscriptions

chrome/browser/push_messaging/push_messaging_service_impl.h

Index: chrome/browser/push_messaging/push_messaging_service_impl.h
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.h b/chrome/browser/push_messaging/push_messaging_service_impl.h
index 50416f94b85f6377fafd1630efddfde84a6d140f..ec3402683841b0906aaf4a9eae3c439968b61421 100644
--- a/chrome/browser/push_messaging/push_messaging_service_impl.h
+++ b/chrome/browser/push_messaging/push_messaging_service_impl.h
@@ -82,11 +82,13 @@ class PushMessagingServiceImpl : public content::PushMessagingService,
                            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;
@@ -169,9 +171,15 @@ class PushMessagingServiceImpl : public content::PushMessagingService,
       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 DidValidateSubscription(const std::string& app_id,
+                               const std::string& sender_id,
+                               const SubscriptionInfoCallback& callback,
+                               bool is_valid);
 
-  void DidGetEncryptionInfo(const EncryptionInfoCallback& callback,
+  void DidGetEncryptionInfo(const SubscriptionInfoCallback& callback,
                             const std::string& p256dh,
                             const std::string& auth_secret) const;