Remove support for PushSubscription.subscriptionId.

Source/modules/push_messaging/PushSubscription.cpp

Index: Source/modules/push_messaging/PushSubscription.cpp
diff --git a/Source/modules/push_messaging/PushSubscription.cpp b/Source/modules/push_messaging/PushSubscription.cpp
index 5d1597545e8abda984d0c3cee2a5aa44c0bcc191..e006eeaa4591de35bd57d46cbb36c09ea41362a5 100644
--- a/Source/modules/push_messaging/PushSubscription.cpp
+++ b/Source/modules/push_messaging/PushSubscription.cpp
@@ -20,7 +20,7 @@ namespace blink {
 PushSubscription* PushSubscription::take(ScriptPromiseResolver*, WebPushSubscription* pushSubscription, ServiceWorkerRegistration* serviceWorkerRegistration)
 {
     OwnPtr<WebPushSubscription> subscription = adoptPtr(pushSubscription);
-    return new PushSubscription(subscription->endpoint, subscription->subscriptionId, serviceWorkerRegistration);
+    return new PushSubscription(subscription->endpoint, serviceWorkerRegistration);
 }
 
 void PushSubscription::dispose(WebPushSubscription* pushSubscription)
@@ -29,9 +29,8 @@ void PushSubscription::dispose(WebPushSubscription* pushSubscription)
         delete pushSubscription;
 }
 
-PushSubscription::PushSubscription(const String& endpoint, const String& subscriptionId, ServiceWorkerRegistration* serviceWorkerRegistration)
+PushSubscription::PushSubscription(const KURL& endpoint, ServiceWorkerRegistration* serviceWorkerRegistration)
     : m_endpoint(endpoint)
-    , m_subscriptionId(subscriptionId)
     , m_serviceWorkerRegistration(serviceWorkerRegistration)
 {
 }
@@ -40,11 +39,9 @@ PushSubscription::~PushSubscription()
 {
 }
 
-String PushSubscription::endpoint() const
+KURL PushSubscription::endpoint() const
 {
-    // TODO(peter): Remove all plumbing which separates the endpoint from the subscriptionId
-    // after the deprecation period has finished. https://crbug.com/477401.
-    return m_endpoint + "/" + m_subscriptionId;
+    return m_endpoint;
 }
 
 ScriptPromise PushSubscription::unsubscribe(ScriptState* scriptState)
@@ -63,7 +60,6 @@ ScriptValue PushSubscription::toJSONForBinding(ScriptState* scriptState)
 {
     V8ObjectBuilder result(scriptState);
     result.addString("endpoint", endpoint());
-    result.addString("subscriptionId", subscriptionId());
 
     return result.scriptValue();
 }