Push API: Validate storage before returning cached subscriptions

content/browser/push_messaging/push_messaging_message_filter.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_MESSAGE_FILTER_H_
 #define CONTENT_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_MESSAGE_FILTER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 41 matching lines @@
   void OnSubscribe(int render_frame_id,
                    int request_id,
                    int64_t service_worker_registration_id,
                    const PushSubscriptionOptions& options);
 
   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 33 matching lines @@
 
   void OnGetSubscription(int request_id,
                          int64_t service_worker_registration_id);
 
   void DidGetSubscription(
       int request_id,
       int64_t service_worker_registration_id,
       const std::vector<std::string>& push_subscription_id_and_sender_info,
       ServiceWorkerStatusCode service_worker_status);
 
-  void DidGetSubscriptionKeys(int request_id,
-                              const GURL& endpoint,
-                              const std::string& sender_info,
-                              bool success,
-                              const std::vector<uint8_t>& p256dh,
-                              const std::vector<uint8_t>& auth);
-
   // GetPermission methods on IO thread ----------------------------------------
 
   void OnGetPermissionStatus(int request_id,
                              int64_t service_worker_registration_id,
                              bool user_visible);
 
   // Helper methods on IO thread -----------------------------------------------
 
   // Called via PostTask from UI thread.
   void SendIPC(std::unique_ptr<IPC::Message> message);
 
   // 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_;
+  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_;
 
   base::WeakPtrFactory<PushMessagingMessageFilter> weak_factory_io_to_io_;
 
   DISALLOW_COPY_AND_ASSIGN(PushMessagingMessageFilter);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_MESSAGE_FILTER_H_