Push API: Implement and ship PushSubscription.options

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

Index: third_party/WebKit/Source/modules/push_messaging/PushManagerTest.cpp
diff --git a/third_party/WebKit/Source/modules/push_messaging/PushManagerTest.cpp b/third_party/WebKit/Source/modules/push_messaging/PushManagerTest.cpp
index 0511cb21984d2ddea206be5161a3341beda53f5a..590b7672fcc58c46cd5e6e9d79b8ff99ae930500 100644
--- a/third_party/WebKit/Source/modules/push_messaging/PushManagerTest.cpp
+++ b/third_party/WebKit/Source/modules/push_messaging/PushManagerTest.cpp
@@ -6,6 +6,7 @@
 
 #include "core/dom/DOMArrayBuffer.h"
 #include "modules/push_messaging/PushSubscriptionOptions.h"
+#include "modules/push_messaging/PushSubscriptionOptionsInit.h"
 #include "public/platform/WebString.h"
 #include "public/platform/modules/push_messaging/WebPushSubscriptionOptions.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -28,13 +29,13 @@ const uint8_t kApplicationServerKey[kApplicationServerKeyLength] = {
 
 TEST(PushManagerTest, ValidSenderKey)
 {
-    PushSubscriptionOptions options;
+    PushSubscriptionOptionsInit options;
     options.setApplicationServerKey(
         ArrayBufferOrArrayBufferView::fromArrayBuffer(
             DOMArrayBuffer::create(kApplicationServerKey, kApplicationServerKeyLength)));
 
     TrackExceptionState exceptionState;
-    WebPushSubscriptionOptions output = PushManager::toWebPushSubscriptionOptions(options, exceptionState);
+    WebPushSubscriptionOptions output = PushSubscriptionOptions::toWeb(options, exceptionState);
     EXPECT_FALSE(exceptionState.hadException());
     EXPECT_EQ(output.applicationServerKey.length(), kApplicationServerKeyLength);
 
@@ -52,13 +53,13 @@ TEST(PushManagerTest, InvalidSenderKeyLength)
 {
     uint8_t senderKey[kMaxKeyLength + 1];
     memset(senderKey, 0, sizeof(senderKey));
-    PushSubscriptionOptions options;
+    PushSubscriptionOptionsInit options;
     options.setApplicationServerKey(
         ArrayBufferOrArrayBufferView::fromArrayBuffer(
             DOMArrayBuffer::create(senderKey, kMaxKeyLength + 1)));
 
     TrackExceptionState exceptionState;
-    WebPushSubscriptionOptions output = PushManager::toWebPushSubscriptionOptions(options, exceptionState);
+    WebPushSubscriptionOptions output = PushSubscriptionOptions::toWeb(options, exceptionState);
     EXPECT_TRUE(exceptionState.hadException());
 }