Push API: Implement and ship PushSubscription.options

third_party/WebKit/Source/modules/push_messaging/PushSubscription.cpp

Index: third_party/WebKit/Source/modules/push_messaging/PushSubscription.cpp
diff --git a/third_party/WebKit/Source/modules/push_messaging/PushSubscription.cpp b/third_party/WebKit/Source/modules/push_messaging/PushSubscription.cpp
index 01363e82148f0618121e10c26bfd006b36ef8efb..e466f8b4ced3de91548ca7ee0879f14609e845ad 100644
--- a/third_party/WebKit/Source/modules/push_messaging/PushSubscription.cpp
+++ b/third_party/WebKit/Source/modules/push_messaging/PushSubscription.cpp
@@ -8,6 +8,7 @@
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/V8ObjectBuilder.h"
 #include "modules/push_messaging/PushError.h"
+#include "modules/push_messaging/PushSubscriptionOptions.h"
 #include "modules/serviceworkers/ServiceWorkerRegistration.h"
 #include "public/platform/Platform.h"
 #include "public/platform/modules/push_messaging/WebPushProvider.h"
@@ -33,6 +34,7 @@ void PushSubscription::dispose(WebPushSubscription* pushSubscription)
 
 PushSubscription::PushSubscription(const WebPushSubscription& subscription, ServiceWorkerRegistration* serviceWorkerRegistration)
     : m_endpoint(subscription.endpoint)
+    , m_options(PushSubscriptionOptions::create(subscription.options))
     , m_p256dh(DOMArrayBuffer::create(subscription.p256dh.data(), subscription.p256dh.size()))
     , m_auth(DOMArrayBuffer::create(subscription.auth.data(), subscription.auth.size()))
     , m_serviceWorkerRegistration(serviceWorkerRegistration)
@@ -43,11 +45,6 @@ PushSubscription::~PushSubscription()
 {
 }
 
-KURL PushSubscription::endpoint() const
-{
-    return m_endpoint;
-}
-
 DOMArrayBuffer* PushSubscription::getKey(const AtomicString& name) const
 {
     if (name == "p256dh")
@@ -87,6 +84,7 @@ ScriptValue PushSubscription::toJSONForBinding(ScriptState* scriptState)
 
 DEFINE_TRACE(PushSubscription)
 {
+    visitor->trace(m_options);
     visitor->trace(m_p256dh);
     visitor->trace(m_auth);
     visitor->trace(m_serviceWorkerRegistration);