Revert of Partial implementation of subscription restrictions.

chrome/browser/push_messaging/push_messaging_service_impl.h

Index: chrome/browser/push_messaging/push_messaging_service_impl.h
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.h b/chrome/browser/push_messaging/push_messaging_service_impl.h
index a0b145ab64d8186cdbc8b03bdc4af25061c5d54f..3b95d2d56dc2fb8082e68cff2e20531eb08bb040 100644
--- a/chrome/browser/push_messaging/push_messaging_service_impl.h
+++ b/chrome/browser/push_messaging/push_messaging_service_impl.h
@@ -35,7 +35,6 @@
 class Profile;
 class PushMessagingAppIdentifier;
 class PushMessagingServiceObserver;
-struct PushSubscriptionOptions;
 
 namespace gcm {
 class GCMDriver;
@@ -75,14 +74,16 @@
   void SubscribeFromDocument(
       const GURL& requesting_origin,
       int64_t service_worker_registration_id,
+      const std::string& sender_id,
       int renderer_id,
       int render_frame_id,
-      const content::PushSubscriptionOptions& options,
+      bool user_visible,
       const content::PushMessagingService::RegisterCallback& callback) override;
   void SubscribeFromWorker(
       const GURL& requesting_origin,
       int64_t service_worker_registration_id,
-      const content::PushSubscriptionOptions& options,
+      const std::string& sender_id,
+      bool user_visible,
       const content::PushMessagingService::RegisterCallback& callback) override;
   void GetEncryptionInfo(
       const GURL& origin,
@@ -164,7 +165,7 @@
 
   void DidRequestPermission(
       const PushMessagingAppIdentifier& app_identifier,
-      const content::PushSubscriptionOptions& options,
+      const std::string& sender_id,
       const content::PushMessagingService::RegisterCallback& callback,
       content::PermissionStatus permission_status);