Hook up PushSubscriptionOptions on the Chromium side.

This patch teaches Chromium how to deal with the PushSubscriptionOptions
structure in addition to the existing gcm_user_visible_only key. Blink
does not call the new methods yet.

Additionally, rename a whole bunch of things to subscribe where they
touch the Blink API. This allows us to do another three-sided patch
later on. The rename is far from complete on the Chromium side.

This CL is part of a series of four:
  [1] https://codereview.chromium.org/1047533002/
  [2] This patch.
  [3] https://codereview.chromium.org/1044663002/
  [4] https://codereview.chromium.org/1044673002/

BUG=471534, 446883

Review URL: https://codereview.chromium.org/1043723003

Cr-Commit-Position: refs/heads/master@{#323256}

1 files changed, 28 insertions, 24 deletions

diff --git a/content/common/push_messaging_messages.h b/content/common/push_messaging_messages.h
index 2acf204..73c11fe 100644
--- a/content/common/push_messaging_messages.h
+++ b/content/common/push_messaging_messages.h
@@ -5,6 +5,8 @@
 // IPC messages for push messaging.
 // Multiply-included message file, hence no include guard.
 
+#include <stdint.h>
+
 #include "content/public/common/push_messaging_status.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushError.h"
@@ -30,69 +32,71 @@ IPC_ENUM_TRAITS_MAX_VALUE(
 // Messages sent from the browser to the child process.
 
 IPC_MESSAGE_ROUTED3(PushMessagingMsg_RegisterFromDocumentSuccess,
-                    int32 /* request_id */,
+                    int32_t /* request_id */,
                     GURL /* push_endpoint */,
                     std::string /* push_registration_id */)
 
 IPC_MESSAGE_CONTROL3(PushMessagingMsg_RegisterFromWorkerSuccess,
-                     int32 /* request_id */,
+                     int32_t /* request_id */,
                      GURL /* push_endpoint */,
                      std::string /* push_registration_id */)
 
 IPC_MESSAGE_ROUTED2(PushMessagingMsg_RegisterFromDocumentError,
-                    int32 /* request_id */,
+                    int32_t /* request_id */,
                     content::PushRegistrationStatus /* status */)
 
 IPC_MESSAGE_CONTROL2(PushMessagingMsg_RegisterFromWorkerError,
-                     int32 /* request_id */,
+                     int32_t /* request_id */,
                      content::PushRegistrationStatus /* status */)
 
 IPC_MESSAGE_CONTROL2(PushMessagingMsg_UnregisterSuccess,
-                     int32 /* request_id */,
+                     int32_t /* request_id */,
                      bool /* did_unregister */)
 
 IPC_MESSAGE_CONTROL3(PushMessagingMsg_UnregisterError,
-                     int32 /* request_id */,
+                     int32_t /* request_id */,
                      blink::WebPushError::ErrorType /* error_type */,
                      std::string /* error_message */)
 
 IPC_MESSAGE_CONTROL3(PushMessagingMsg_GetRegistrationSuccess,
-                     int32 /* request_id */,
+                     int32_t /* request_id */,
                      GURL /* push_endpoint */,
                      std::string /* push_registration_id */)
 
 IPC_MESSAGE_CONTROL2(PushMessagingMsg_GetRegistrationError,
-                     int32 /* request_id */,
+                     int32_t /* request_id */,
                      content::PushGetRegistrationStatus /* status */)
 
 IPC_MESSAGE_CONTROL2(PushMessagingMsg_GetPermissionStatusSuccess,
-                     int32 /* request_id */,
+                     int32_t /* request_id */,
                      blink::WebPushPermissionStatus /* status */)
 
 IPC_MESSAGE_CONTROL1(PushMessagingMsg_GetPermissionStatusError,
-                     int32 /* request_id */)
+                     int32_t /* request_id */)
 
 // Messages sent from the child process to the browser.
 
 IPC_MESSAGE_CONTROL5(PushMessagingHostMsg_RegisterFromDocument,
-                     int32 /* render_frame_id */,
-                     int32 /* request_id */,
+                     int32_t /* render_frame_id */,
+                     int32_t /* request_id */,
                      std::string /* sender_id */,
-                     bool /* user_visible_only */,
-                     int64 /* service_worker_registration_id */)
+                     bool /* user_visible */,
+                     int64_t /* service_worker_registration_id */)
 
-IPC_MESSAGE_CONTROL2(PushMessagingHostMsg_RegisterFromWorker,
-                     int32 /* request_id */,
-                     int64 /* service_worker_registration_id */)
+IPC_MESSAGE_CONTROL3(PushMessagingHostMsg_RegisterFromWorker,
+                     int32_t /* request_id */,
+                     int64_t /* service_worker_registration_id */,
+                     bool /* user_visible */)
 
 IPC_MESSAGE_CONTROL2(PushMessagingHostMsg_Unregister,
-                     int32 /* request_id */,
-                     int64 /* service_worker_registration_id */)
+                     int32_t /* request_id */,
+                     int64_t /* service_worker_registration_id */)
 
 IPC_MESSAGE_CONTROL2(PushMessagingHostMsg_GetRegistration,
-                     int32 /* request_id */,
-                     int64 /* service_worker_registration_id */)
+                     int32_t /* request_id */,
+                     int64_t /* service_worker_registration_id */)
 
-IPC_MESSAGE_CONTROL2(PushMessagingHostMsg_GetPermissionStatus,
-                     int32 /* request_id */,
-                     int64 /* service_worker_registration_id */)
+IPC_MESSAGE_CONTROL3(PushMessagingHostMsg_GetPermissionStatus,
+                     int32_t /* request_id */,
+                     int64_t /* service_worker_registration_id */,
+                     bool /* user_visible */)