Merge the value of the push subscription id into the endpoint.

Source/modules/push_messaging/PushSubscription.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/push_messaging/PushSubscription.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/V8ObjectBuilder.h"
@@ skipping 22 matching lines @@
     : m_endpoint(endpoint)
     , m_subscriptionId(subscriptionId)
     , m_serviceWorkerRegistration(serviceWorkerRegistration)
 {
 }
 
 PushSubscription::~PushSubscription()
 {
 }
 
+String 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;
+}
+
 ScriptPromise PushSubscription::unsubscribe(ScriptState* scriptState)
 {
     RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
     WebPushProvider* webPushProvider = Platform::current()->pushProvider();
     ASSERT(webPushProvider);
 
     webPushProvider->unregister(m_serviceWorkerRegistration->webRegistration(), new CallbackPromiseAdapter<bool, PushError>(resolver));
     return promise;
 }
 
 ScriptValue PushSubscription::toJSONForBinding(ScriptState* scriptState)
 {
     V8ObjectBuilder result(scriptState);
-    result.addString("endpoint", m_endpoint);
-    result.addString("subscriptionId", m_subscriptionId);
+    result.addString("endpoint", endpoint());
+    result.addString("subscriptionId", subscriptionId());
 
     return result.scriptValue();
 }
 
 DEFINE_TRACE(PushSubscription)
 {
     visitor->trace(m_serviceWorkerRegistration);
 }
 
 } // namespace blink