Push API: Validate storage before returning cached subscriptions

components/gcm_driver/crypto/gcm_encryption_provider.h

Index: components/gcm_driver/crypto/gcm_encryption_provider.h
diff --git a/components/gcm_driver/crypto/gcm_encryption_provider.h b/components/gcm_driver/crypto/gcm_encryption_provider.h
index 81a96b73c51c9f8d2e67c46603a6527001dca8c2..a117134251f66f536f224d8621b056aba057e4f2 100644
--- a/components/gcm_driver/crypto/gcm_encryption_provider.h
+++ b/components/gcm_driver/crypto/gcm_encryption_provider.h
@@ -59,8 +59,9 @@ class GCMEncryptionProvider {
   };
 
   // Callback to be invoked when the public key and auth secret are available.
-  using EncryptionInfoCallback = base::Callback<void(const std::string&,
-                                                     const std::string&)>;
+  using EncryptionInfoCallback =
+      base::Callback<void(const std::string& p256dh,
+                          const std::string& auth_secret)>;
 
   // Callback to be invoked when a message may have been decrypted, as indicated
   // by the |result|. The |message| contains the dispatchable message in success