Push API: Implement and ship PushSubscription.options

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 f3710684a3d82fb1d79f524058293f8b8e8a6f47..5e1caf421a6e8ad36a265249f3e633e46a7cc5ba 100644
--- a/content/common/push_messaging_messages.h
+++ b/content/common/push_messaging_messages.h
@@ -37,15 +37,17 @@ IPC_STRUCT_TRAITS_END()
 
 // Messages sent from the browser to the child process.
 
-IPC_MESSAGE_ROUTED4(PushMessagingMsg_SubscribeFromDocumentSuccess,
+IPC_MESSAGE_ROUTED5(PushMessagingMsg_SubscribeFromDocumentSuccess,
                     int32_t /* request_id */,
                     GURL /* push_endpoint */,
+                    content::PushSubscriptionOptions /* options */,
                     std::vector<uint8_t> /* p256dh */,
                     std::vector<uint8_t> /* auth */)
 
-IPC_MESSAGE_CONTROL4(PushMessagingMsg_SubscribeFromWorkerSuccess,
+IPC_MESSAGE_CONTROL5(PushMessagingMsg_SubscribeFromWorkerSuccess,
                      int32_t /* request_id */,
                      GURL /* push_endpoint */,
+                     content::PushSubscriptionOptions /* options */,
                      std::vector<uint8_t> /* p256dh */,
                      std::vector<uint8_t> /* auth */)
 
@@ -66,9 +68,10 @@ IPC_MESSAGE_CONTROL3(PushMessagingMsg_UnsubscribeError,
                      blink::WebPushError::ErrorType /* error_type */,
                      std::string /* error_message */)
 
-IPC_MESSAGE_CONTROL4(PushMessagingMsg_GetSubscriptionSuccess,
+IPC_MESSAGE_CONTROL5(PushMessagingMsg_GetSubscriptionSuccess,
                      int32_t /* request_id */,
                      GURL /* push_endpoint */,
+                     content::PushSubscriptionOptions /* options */,
                      std::vector<uint8_t> /* p256dh */,
                      std::vector<uint8_t> /* auth */)