Move push endpoint concatenation up to the browser process.

content/renderer/push_messaging/push_messaging_dispatcher.cc

 // 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 "content/renderer/push_messaging/push_messaging_dispatcher.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/common/push_messaging_messages.h"
 #include "content/renderer/manifest/manifest_manager.h"
 #include "content/renderer/render_frame_impl.h"
 #include "ipc/ipc_message.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerRegistration.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushError.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubscription.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubscriptionOptions.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "url/gurl.h"
 
-using blink::WebString;
-
 namespace content {
 
 PushMessagingDispatcher::PushMessagingDispatcher(RenderFrame* render_frame)
     : RenderFrameObserver(render_frame) {
 }
 
 PushMessagingDispatcher::~PushMessagingDispatcher() {}
 
 bool PushMessagingDispatcher::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
@@ skipping 45 matching lines @@
   Send(new PushMessagingHostMsg_SubscribeFromDocument(
       routing_id(), request_id,
       manifest.gcm_sender_id.is_null()
           ? std::string()
           : base::UTF16ToUTF8(manifest.gcm_sender_id.string()),
       options.userVisibleOnly, service_worker_registration_id));
 }
 
 void PushMessagingDispatcher::OnSubscribeFromDocumentSuccess(
     int32_t request_id,
-    const GURL& endpoint,
-    const std::string& subscription_id) {
+    const GURL& endpoint) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
 
   // TODO(peter): Change this back to a DCHECK before M45 branches.
   CHECK(callbacks) << "Invalid request id received: " << request_id;
 
   scoped_ptr<blink::WebPushSubscription> subscription(
-      new blink::WebPushSubscription(
-          WebString::fromUTF8(endpoint.spec()),
-          WebString::fromUTF8(subscription_id)));
+      new blink::WebPushSubscription(endpoint));
   callbacks->onSuccess(subscription.release());
 
   subscription_callbacks_.Remove(request_id);
 }
 
 void PushMessagingDispatcher::OnSubscribeFromDocumentError(
     int32_t request_id,
     PushRegistrationStatus status) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
 
   // TODO(peter): Change this back to a DCHECK before M45 branches.
   CHECK(callbacks) << "Invalid request id received: " << request_id;
 
   scoped_ptr<blink::WebPushError> error(new blink::WebPushError(
       blink::WebPushError::ErrorTypeAbort,
-      WebString::fromUTF8(PushRegistrationStatusToString(status))));
+      blink::WebString::fromUTF8(PushRegistrationStatusToString(status))));
   callbacks->onError(error.release());
 
   subscription_callbacks_.Remove(request_id);
 }
 
 }  // namespace content