[Push] Use Manifest.gcm_sender_id instead of API sender_id if possible.

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"
+#include "content/renderer/render_frame_impl.h"
 #include "ipc/ipc_message.h"
 #include "third_party/WebKit/public/platform/WebPushError.h"
 #include "third_party/WebKit/public/platform/WebPushRegistration.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerProvider.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 #include "url/gurl.h"
 
 using blink::WebString;
 
@@ skipping 10 matching lines @@
   IPC_BEGIN_MESSAGE_MAP(PushMessagingDispatcher, message)
     IPC_MESSAGE_HANDLER(PushMessagingMsg_RegisterSuccess, OnRegisterSuccess)
     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) {
-  DCHECK(callbacks);
-  scoped_ptr<blink::WebPushError> error(new blink::WebPushError(
-      blink::WebPushError::ErrorTypeAbort,
-      WebString::fromUTF8(PushMessagingStatusToString(
-          PUSH_MESSAGING_STATUS_REGISTRATION_FAILED_NO_SERVICE_WORKER))));
-  callbacks->onError(error.release());
-  delete callbacks;
-}
-
-void PushMessagingDispatcher::registerPushMessaging(
-    const WebString& sender_id,
     blink::WebPushRegistrationCallbacks* callbacks,
     blink::WebServiceWorkerProvider* service_worker_provider) {
+  RenderFrameImpl* render_frame_impl =
+      RenderFrameImpl::FromRoutingID(routing_id());
+  DCHECK(render_frame_impl);

[Michael van Ouwerkerk, 2014/09/29 18:11:48]

Let's not DCHECK here as the dispatcher is owned by the frame.

[mlamouri (slow - plz ping), 2014/09/30 09:44:52]

Done.

+
+  ManifestManager* manifest_manager = render_frame_impl->manifest_manager();
+  DCHECK(manifest_manager);

[Michael van Ouwerkerk, 2014/09/29 18:11:48]

Ditto here.

[mlamouri (slow - plz ping), 2014/09/30 09:44:52]

Done.

+
+  manifest_manager->GetManifest(base::Bind(&PushMessagingDispatcher::DoRegister,

[Michael van Ouwerkerk, 2014/09/29 18:11:48]

Then collapse this to render_frame_impl->manifest_manager()->GetManifest(...)

[mlamouri (slow - plz ping), 2014/09/30 09:44:52]

I collapsed everything.

+                                           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,
-      sender_id.utf8(),
+      manifest.gcm_sender_id.is_null()
+          ? sender_id
+          : 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 =
       registration_callbacks_.Lookup(callbacks_id);
@@ skipping 14 matching lines @@
   CHECK(callbacks);
 
   scoped_ptr<blink::WebPushError> error(new blink::WebPushError(
       blink::WebPushError::ErrorTypeAbort,
       WebString::fromUTF8(PushMessagingStatusToString(status))));
   callbacks->onError(error.release());
   registration_callbacks_.Remove(callbacks_id);
 }
 
 }  // namespace content