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

content/renderer/push_messaging_dispatcher.h

Index: content/renderer/push_messaging_dispatcher.h
diff --git a/content/renderer/push_messaging_dispatcher.h b/content/renderer/push_messaging_dispatcher.h
index 33ac7bde97a43aa29da52efb07f2560e8d02ecb1..70ec977da50f68486521c4f0c6abf9a38c5f5251 100644
--- a/content/renderer/push_messaging_dispatcher.h
+++ b/content/renderer/push_messaging_dispatcher.h
@@ -24,6 +24,9 @@ class WebString;
 }  // namespace blink
 
 namespace content {
+
+struct Manifest;
+
 class PushMessagingDispatcher : public RenderFrameObserver,
                                 public blink::WebPushClient {
  public:
@@ -35,16 +38,16 @@ class PushMessagingDispatcher : public RenderFrameObserver,
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // WebPushClient implementation.
-  // TODO(mvanouwerkerk): Delete this method once its callers are gone and
-  // WebPushClient no longer defines it (as pure virtual).
-  virtual void registerPushMessaging(
-      const blink::WebString& sender_id,
-      blink::WebPushRegistrationCallbacks* callbacks);
   virtual void registerPushMessaging(
       const blink::WebString& sender_id,
       blink::WebPushRegistrationCallbacks* callbacks,
       blink::WebServiceWorkerProvider* service_worker_provider);
 
+  void DoRegister(const std::string& sender_id,
+                  blink::WebPushRegistrationCallbacks* callbacks,
+                  blink::WebServiceWorkerProvider* service_worker_provider,
+                  const Manifest& manifest);
+
   void OnRegisterSuccess(int32 callbacks_id,
                          const GURL& endpoint,
                          const std::string& registration_id);