Partial implementation of subscription restrictions.

content/browser/push_messaging/push_messaging_message_filter.h

Index: content/browser/push_messaging/push_messaging_message_filter.h
diff --git a/content/browser/push_messaging/push_messaging_message_filter.h b/content/browser/push_messaging/push_messaging_message_filter.h
index aba0b348abcb49a336c98115556ed60370072653..80d13b361f30e3ed06a3335a509c175524fdcea7 100644
--- a/content/browser/push_messaging/push_messaging_message_filter.h
+++ b/content/browser/push_messaging/push_messaging_message_filter.h
@@ -23,6 +23,7 @@ namespace content {
 
 class PushMessagingService;
 class ServiceWorkerContextWrapper;
+struct PushSubscriptionOptions;
 
 extern const char kPushSenderIdServiceWorkerKey[];
 extern const char kPushRegistrationIdServiceWorkerKey[];
@@ -50,26 +51,25 @@ class PushMessagingMessageFilter : public BrowserMessageFilter {
 
   void OnSubscribeFromDocument(int render_frame_id,
                                int request_id,
-                               const std::string& sender_id,
-                               bool user_visible,
+                               const PushSubscriptionOptions& options,
                                int64_t service_worker_registration_id);
 
   void OnSubscribeFromWorker(int request_id,
                              int64_t service_worker_registration_id,
-                             bool user_visible);
+                             const PushSubscriptionOptions& options);
 
-  void DidPersistSenderId(const RegisterData& data,
-                          const std::string& sender_id,
-                          ServiceWorkerStatusCode service_worker_status);
+  void DidPersistSenderInfo(const RegisterData& data,
+                            const PushSubscriptionOptions& options,
+                            ServiceWorkerStatusCode service_worker_status);
 
   // sender_id is ignored if data.FromDocument() is false.
   void CheckForExistingRegistration(const RegisterData& data,
-                                    const std::string& sender_id);
+                                    const PushSubscriptionOptions& options);
 
   // sender_id is ignored if data.FromDocument() is false.
   void DidCheckForExistingRegistration(
       const RegisterData& data,
-      const std::string& sender_id,
+      const PushSubscriptionOptions& options,
       const std::string& push_registration_id,
       ServiceWorkerStatusCode service_worker_status);
 
@@ -79,6 +79,11 @@ class PushMessagingMessageFilter : public BrowserMessageFilter {
                             const std::vector<uint8_t>& p256dh,
                             const std::vector<uint8_t>& auth);
 
+  void DidGetSenderKeyFromStorage(
+      const RegisterData& data,
+      const std::string& sender_key,
+      ServiceWorkerStatusCode service_worker_status);
+
   void DidGetSenderIdFromStorage(const RegisterData& data,
                                  const std::string& sender_id,
                                  ServiceWorkerStatusCode service_worker_status);