Push API: Implement and ship PushSubscription.options

content/child/push_messaging/push_provider.cc

Index: content/child/push_messaging/push_provider.cc
diff --git a/content/child/push_messaging/push_provider.cc b/content/child/push_messaging/push_provider.cc
index 59992b76dea44cf3b9138fc11ce8cdbd4ca6d21f..19699140d79efcdb66cbefc89630c1e61853b33d 100644
--- a/content/child/push_messaging/push_provider.cc
+++ b/content/child/push_messaging/push_provider.cc
@@ -15,6 +15,7 @@
 #include "content/child/thread_safe_sender.h"
 #include "content/common/push_messaging_messages.h"
 #include "content/public/common/child_process_host.h"
+#include "content/public/common/push_subscription_options.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubscription.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubscriptionOptions.h"
@@ -158,6 +159,7 @@ bool PushProvider::OnMessageReceived(const IPC::Message& message) {
 void PushProvider::OnSubscribeFromWorkerSuccess(
     int request_id,
     const GURL& endpoint,
+    const PushSubscriptionOptions& options,
     const std::vector<uint8_t>& p256dh,
     const std::vector<uint8_t>& auth) {
   blink::WebPushSubscriptionCallbacks* callbacks =
@@ -165,8 +167,9 @@ void PushProvider::OnSubscribeFromWorkerSuccess(
   if (!callbacks)
     return;
 
-  callbacks->onSuccess(
-      base::WrapUnique(new blink::WebPushSubscription(endpoint, p256dh, auth)));
+  callbacks->onSuccess(base::WrapUnique(new blink::WebPushSubscription(
+      endpoint, options.user_visible_only,
+      blink::WebString::fromLatin1(options.sender_info), p256dh, auth)));
 
   subscription_callbacks_.Remove(request_id);
 }
@@ -218,6 +221,7 @@ void PushProvider::OnUnsubscribeError(int request_id,
 void PushProvider::OnGetSubscriptionSuccess(
     int request_id,
     const GURL& endpoint,
+    const PushSubscriptionOptions& options,
     const std::vector<uint8_t>& p256dh,
     const std::vector<uint8_t>& auth) {
   blink::WebPushSubscriptionCallbacks* callbacks =
@@ -225,8 +229,9 @@ void PushProvider::OnGetSubscriptionSuccess(
   if (!callbacks)
     return;
 
-  callbacks->onSuccess(
-      base::WrapUnique(new blink::WebPushSubscription(endpoint, p256dh, auth)));
+  callbacks->onSuccess(base::WrapUnique(new blink::WebPushSubscription(
+      endpoint, options.user_visible_only,
+      blink::WebString::fromLatin1(options.sender_info), p256dh, auth)));

[Peter Beverloo, 2016/07/08 18:30:12]

When moving to Mojo, we'd probably want Blink to think about this as a uint8_t
vector (as that's the natural type there), and Chrome to think about this as an
std::string (as both SW user data and the GCM Driver require that)?

[johnme, 2016/07/13 17:51:57]

Acknowledged. Added a TODO in WebPushSubscriptionOptions.h

 
   subscription_callbacks_.Remove(request_id);
 }