Move push endpoint concatenation up to the browser process.

content/child/push_messaging/push_provider.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/child/push_messaging/push_provider.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
@@ skipping 130 matching lines @@
     IPC_MESSAGE_HANDLER(PushMessagingMsg_GetPermissionStatusError,
                         OnGetPermissionStatusError);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void PushProvider::OnSubscribeFromWorkerSuccess(
     int request_id,
-    const GURL& endpoint,
-    const std::string& subscription_id) {
+    const GURL& endpoint) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
   scoped_ptr<blink::WebPushSubscription> subscription(
-      new blink::WebPushSubscription(
-          blink::WebString::fromUTF8(endpoint.spec()),
-          blink::WebString::fromUTF8(subscription_id)));
+      new blink::WebPushSubscription(endpoint));
   callbacks->onSuccess(subscription.release());
 
   subscription_callbacks_.Remove(request_id);
 }
 
 void PushProvider::OnSubscribeFromWorkerError(int request_id,
                                               PushRegistrationStatus status) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   if (!callbacks)
@@ skipping 29 matching lines @@
 
   scoped_ptr<blink::WebPushError> error(new blink::WebPushError(
       error_type, blink::WebString::fromUTF8(error_message)));
   callbacks->onError(error.release());
 
   unsubscribe_callbacks_.Remove(request_id);
 }
 
 void PushProvider::OnGetRegistrationSuccess(
     int request_id,
-    const GURL& endpoint,
-    const std::string& registration_id) {
+    const GURL& endpoint) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
   scoped_ptr<blink::WebPushSubscription> subscription(
-      new blink::WebPushSubscription(
-          blink::WebString::fromUTF8(endpoint.spec()),
-          blink::WebString::fromUTF8(registration_id)));
+      new blink::WebPushSubscription(endpoint));
   callbacks->onSuccess(subscription.release());
 
   subscription_callbacks_.Remove(request_id);
 }
 
 void PushProvider::OnGetRegistrationError(
     int request_id,
     PushGetRegistrationStatus status) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
@@ skipping 36 matching lines @@
 
   scoped_ptr<blink::WebPushError> web_error(new blink::WebPushError(
       error, blink::WebString::fromUTF8(error_message)));
 
   callbacks->onError(web_error.release());
 
   permission_status_callbacks_.Remove(request_id);
 }
 
 }  // namespace content