Push API: Validate storage before returning cached subscriptions

content/browser/push_messaging/push_messaging_manager.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 CONTENT_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_MANAGER_H_
 #define CONTENT_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 48 matching lines @@
   friend class base::DeleteHelper<PushMessagingManager>;
   friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>;
 
   ~PushMessagingManager() override;
 
   void DidCheckForExistingRegistration(
       const RegisterData& data,
       const std::vector<std::string>& push_registration_id,
       ServiceWorkerStatusCode service_worker_status);
 
-  void DidGetEncryptionKeys(const RegisterData& data,
-                            const std::string& push_registration_id,
-                            bool success,
-                            const std::vector<uint8_t>& p256dh,
-                            const std::vector<uint8_t>& auth);
-
   void DidGetSenderIdFromStorage(const RegisterData& data,
                                  const std::vector<std::string>& sender_id,
                                  ServiceWorkerStatusCode service_worker_status);
 
   // Called via PostTask from UI thread.
   void PersistRegistrationOnIO(const RegisterData& data,
                                const std::string& push_registration_id,
                                const std::vector<uint8_t>& p256dh,
                                const std::vector<uint8_t>& auth);
 
@@ skipping 24 matching lines @@
   // Called both from IO thread, and via PostTask from UI thread.
   void DidUnregister(const UnsubscribeCallback& callback,
                      PushUnregistrationStatus unregistration_status);
 
   void DidGetSubscription(
       const GetSubscriptionCallback& callback,
       int64_t service_worker_registration_id,
       const std::vector<std::string>& push_subscription_id_and_sender_info,
       ServiceWorkerStatusCode service_worker_status);
 
-  void DidGetSubscriptionKeys(const GetSubscriptionCallback& callback,
-                              const GURL& endpoint,
-                              const std::string& sender_info,
-                              bool success,
-                              const std::vector<uint8_t>& p256dh,
-                              const std::vector<uint8_t>& auth);
-
   // Helper methods on either thread -------------------------------------------
 
   // Creates an endpoint for |subscription_id| with either the default protocol,
   // or the standardized Web Push Protocol, depending on |standard_protocol|.
   GURL CreateEndpoint(bool standard_protocol,
                       const std::string& subscription_id) const;
 
   // Inner core of this message filter which lives on the UI thread.
   std::unique_ptr<Core, BrowserThread::DeleteOnUIThread> ui_core_;
 
+  // Can be used on the IO thread as the |this| parameter when binding a
+  // callback that will be called on the UI thread (an IO -> UI -> UI chain).
+  base::WeakPtr<Core> ui_core_weak_ptr_;
+
   scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
 
   // Whether the PushMessagingService was available when constructed.
   bool service_available_;
 
   GURL default_endpoint_;
   GURL web_push_protocol_endpoint_;
 
   mojo::BindingSet<mojom::PushMessaging> bindings_;
 
   base::WeakPtrFactory<PushMessagingManager> weak_factory_io_to_io_;
 
   DISALLOW_COPY_AND_ASSIGN(PushMessagingManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_MANAGER_H_