Remove the sender_id from the Push API code path.

content/renderer/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_dispatcher.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/service_worker/web_service_worker_provider_impl.h"
 #include "content/common/push_messaging_messages.h"
 #include "content/renderer/manifest/manifest_manager.h"
@@ skipping 23 matching lines @@
     IPC_MESSAGE_HANDLER(PushMessagingMsg_RegisterError, OnRegisterError)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PushMessagingDispatcher::registerPushMessaging(
     const WebString& sender_id,
     blink::WebPushRegistrationCallbacks* callbacks,
     blink::WebServiceWorkerProvider* service_worker_provider) {
+  registerPushMessaging(callbacks, service_worker_provider);
+}
+
+void PushMessagingDispatcher::registerPushMessaging(
+    blink::WebPushRegistrationCallbacks* callbacks,
+    blink::WebServiceWorkerProvider* service_worker_provider) {
   RenderFrameImpl::FromRoutingID(routing_id())->manifest_manager()->GetManifest(
       base::Bind(&PushMessagingDispatcher::DoRegister,
                  base::Unretained(this),
-                 sender_id.utf8(),
                  callbacks,
                  service_worker_provider));
 }
 
 void PushMessagingDispatcher::DoRegister(
-    const std::string& sender_id,
     blink::WebPushRegistrationCallbacks* callbacks,
     blink::WebServiceWorkerProvider* service_worker_provider,
     const Manifest& manifest) {
   DCHECK(callbacks);
   int callbacks_id = registration_callbacks_.Add(callbacks);
   int service_worker_provider_id = static_cast<WebServiceWorkerProviderImpl*>(
                                        service_worker_provider)->provider_id();
   Send(new PushMessagingHostMsg_Register(
       routing_id(),
       callbacks_id,
       manifest.gcm_sender_id.is_null()
-          ? sender_id
+          ? std::string()
           : base::UTF16ToUTF8(manifest.gcm_sender_id.string()),
       blink::WebUserGestureIndicator::isProcessingUserGesture(),
       service_worker_provider_id));
 }
 
 void PushMessagingDispatcher::OnRegisterSuccess(
     int32 callbacks_id,
     const GURL& endpoint,
     const std::string& registration_id) {
   blink::WebPushRegistrationCallbacks* callbacks =
@@ skipping 15 matching lines @@
   CHECK(callbacks);
 
   scoped_ptr<blink::WebPushError> error(new blink::WebPushError(
       blink::WebPushError::ErrorTypeAbort,
       WebString::fromUTF8(PushRegistrationStatusToString(status))));
   callbacks->onError(error.release());
   registration_callbacks_.Remove(callbacks_id);
 }
 
 }  // namespace content