Revert of Partial implementation of subscription restrictions.

content/common/push_messaging_messages.h

Index: content/common/push_messaging_messages.h
diff --git a/content/common/push_messaging_messages.h b/content/common/push_messaging_messages.h
index df88b2f2a552f86ab65fa25563af10b709b9247a..38a39e8cb116d50dbbccae7ea190e878ed52588f 100644
--- a/content/common/push_messaging_messages.h
+++ b/content/common/push_messaging_messages.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "content/public/common/push_messaging_status.h"
-#include "content/public/common/push_subscription_options.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushError.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushPermissionStatus.h"
@@ -29,11 +28,6 @@
 IPC_ENUM_TRAITS_MAX_VALUE(
     blink::WebPushError::ErrorType,
     blink::WebPushError::ErrorType::ErrorTypeLast)
-
-IPC_STRUCT_TRAITS_BEGIN(content::PushSubscriptionOptions)
-  IPC_STRUCT_TRAITS_MEMBER(user_visible_only)
-  IPC_STRUCT_TRAITS_MEMBER(sender_info)
-IPC_STRUCT_TRAITS_END()
 
 // Messages sent from the browser to the child process.
 
@@ -86,16 +80,17 @@
 
 // Messages sent from the child process to the browser.
 
-IPC_MESSAGE_CONTROL4(PushMessagingHostMsg_SubscribeFromDocument,
+IPC_MESSAGE_CONTROL5(PushMessagingHostMsg_SubscribeFromDocument,
                      int32_t /* render_frame_id */,
                      int32_t /* request_id */,
-                     content::PushSubscriptionOptions /* options */,
+                     std::string /* sender_id */,
+                     bool /* user_visible */,
                      int64_t /* service_worker_registration_id */)
 
 IPC_MESSAGE_CONTROL3(PushMessagingHostMsg_SubscribeFromWorker,
                      int32_t /* request_id */,
                      int64_t /* service_worker_registration_id */,
-                     content::PushSubscriptionOptions /* options */)
+                     bool /* user_visible */)
 
 IPC_MESSAGE_CONTROL2(PushMessagingHostMsg_Unsubscribe,
                      int32_t /* request_id */,