Push API: Validate storage before returning cached subscriptions

components/gcm_driver/instance_id/instance_id.h

 // Copyright 2015 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 COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_H_
 #define COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 33 matching lines @@
     // 6 is omitted, in case we ever merge this enum with GCMClient::Result.
     // Other errors.
     UNKNOWN_ERROR = 7,
 
     // Used for UMA. Keep LAST_RESULT up to date and sync with histograms.xml.
     LAST_RESULT = UNKNOWN_ERROR
   };
 
   // Asynchronous callbacks. Must not synchronously delete |this| (using
   // InstanceIDDriver::RemoveInstanceID).
-  typedef base::Callback<void(const std::string& app_id,
-                              bool update_id)> TokenRefreshCallback;
-  typedef base::Callback<void(const std::string& id)> GetIDCallback;
-  typedef base::Callback<void(const base::Time& creation_time)>
-      GetCreationTimeCallback;
-  typedef base::Callback<void(const std::string& token,
-                              Result result)> GetTokenCallback;
-  typedef base::Callback<void(const std::string&, const std::string&)>
-      GetEncryptionInfoCallback;
-  typedef base::Callback<void(Result result)> DeleteTokenCallback;
-  typedef base::Callback<void(Result result)> DeleteIDCallback;
+  using TokenRefreshCallback =
+      base::Callback<void(const std::string& app_id, bool update_id)>;
+  using GetIDCallback = base::Callback<void(const std::string& id)>;
+  using GetCreationTimeCallback =
+      base::Callback<void(const base::Time& creation_time)>;
+  using GetTokenCallback =
+      base::Callback<void(const std::string& token, Result result)>;
+  using ValidateTokenCallback = base::Callback<void(bool is_valid)>;
+  using GetEncryptionInfoCallback =
+      base::Callback<void(const std::string&, const std::string&)>;
+  using DeleteTokenCallback = base::Callback<void(Result result)>;
+  using DeleteIDCallback = base::Callback<void(Result result)>;
 
   static const int kInstanceIDByteLength = 8;
 
   // Creator. Should only be used by InstanceIDDriver::GetInstanceID.
   // |app_id|: identifies the application that uses the Instance ID.
   // |handler|: provides the GCM functionality needed to support Instance ID.
   //            Must outlive this class. On Android, this can be null instead.
   static std::unique_ptr<InstanceID> CreateInternal(const std::string& app_id,
                                                     gcm::GCMDriver* gcm_driver);
 
@@ skipping 18 matching lines @@
   //          E.g. for sending GCM messages, "GCM" scope should be used.
   // |options|: allows including a small number of string key/value pairs that
   //            will be associated with the token and may be used in processing
   //            the request.
   // |callback|: to be called once the asynchronous operation is done.
   virtual void GetToken(const std::string& authorized_entity,
                         const std::string& scope,
                         const std::map<std::string, std::string>& options,
                         const GetTokenCallback& callback) = 0;
 
+  // Checks that the provided |token| matches the stored token for (|app_id()|,
+  // |authorized_entity|, |scope|).
+  virtual void ValidateToken(const std::string& authorized_entity,
+                             const std::string& scope,
+                             const std::string& token,
+                             const ValidateTokenCallback& callback) = 0;
+
   // Get the public encryption key and authentication secret associated with a
   // GCM-scoped token. If encryption info is not yet associated, it will be
   // created.
   // |authorized_entity|: the authorized entity passed when obtaining the token.
   // |callback|: to be called once the asynchronous operation is done.
   void GetEncryptionInfo(const std::string& authorized_entity,
                          const GetEncryptionInfoCallback& callback);
 
   // Revokes a granted token.
   // |authorized_entity|: the authorized entity passed when obtaining the token.
@@ skipping 36 matching lines @@
   TokenRefreshCallback token_refresh_callback_;
 
   base::WeakPtrFactory<InstanceID> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InstanceID);
 };
 
 }  // namespace instance_id
 
 #endif  // COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_H_