Revert of 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 d2db18a39c899cebd7c7846700bcaf006bc9b3ef..aba0b348abcb49a336c98115556ed60370072653 100644
--- a/content/browser/push_messaging/push_messaging_message_filter.h
+++ b/content/browser/push_messaging/push_messaging_message_filter.h
@@ -23,7 +23,6 @@
 
 class PushMessagingService;
 class ServiceWorkerContextWrapper;
-struct PushSubscriptionOptions;
 
 extern const char kPushSenderIdServiceWorkerKey[];
 extern const char kPushRegistrationIdServiceWorkerKey[];
@@ -51,25 +50,26 @@
 
   void OnSubscribeFromDocument(int render_frame_id,
                                int request_id,
-                               const PushSubscriptionOptions& options,
+                               const std::string& sender_id,
+                               bool user_visible,
                                int64_t service_worker_registration_id);
 
   void OnSubscribeFromWorker(int request_id,
                              int64_t service_worker_registration_id,
-                             const PushSubscriptionOptions& options);
+                             bool user_visible);
 
-  void DidPersistSenderInfo(const RegisterData& data,
-                            const PushSubscriptionOptions& options,
-                            ServiceWorkerStatusCode service_worker_status);
+  void DidPersistSenderId(const RegisterData& data,
+                          const std::string& sender_id,
+                          ServiceWorkerStatusCode service_worker_status);
 
   // sender_id is ignored if data.FromDocument() is false.
   void CheckForExistingRegistration(const RegisterData& data,
-                                    const PushSubscriptionOptions& options);
+                                    const std::string& sender_id);
 
   // sender_id is ignored if data.FromDocument() is false.
   void DidCheckForExistingRegistration(
       const RegisterData& data,
-      const PushSubscriptionOptions& options,
+      const std::string& sender_id,
       const std::string& push_registration_id,
       ServiceWorkerStatusCode service_worker_status);