Push API: Validate storage before returning cached subscriptions

components/gcm_driver/crypto/gcm_encryption_provider.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_CRYPTO_GCM_ENCRYPTION_PROVIDER_H_
 #define COMPONENTS_GCM_DRIVER_CRYPTO_GCM_ENCRYPTION_PROVIDER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 41 matching lines @@
     // The shared secret cannot be derived from the keying material.
     DECRYPTION_RESULT_INVALID_SHARED_SECRET = 5,
 
     // The payload could not be decrypted as AES-128-GCM.
     DECRYPTION_RESULT_INVALID_PAYLOAD = 6,
 
     DECRYPTION_RESULT_LAST = DECRYPTION_RESULT_INVALID_PAYLOAD
   };
 
   // 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
   // cases, or will be initialized to an empty, default state for failure.
   using MessageCallback = base::Callback<void(DecryptionResult result,
                                               const IncomingMessage& message)>;
 
   // Converts |result| to a string describing the details of said result.
   static std::string ToDecryptionResultDetailsString(DecryptionResult result);
 
@@ skipping 62 matching lines @@
   std::unique_ptr<GCMKeyStore> key_store_;
 
   base::WeakPtrFactory<GCMEncryptionProvider> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMEncryptionProvider);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_CRYPTO_GCM_ENCRYPTION_PROVIDER_H_