Removed unused |render_frame_id| from mojom::PushMessaging::Subscribe()

We now use DocumentInterfaceBroker to communicate with the RenderFrame
in the browser process, so we don't need to pass a routing ID for the
render frame anymore.

This CL removes the parameter and all its references from callsites,
which were already passing -1 (invalid ID) anyway.

Bug: 939943
Change-Id: I3cecd93de28feff24722a7870673225512dfd8ba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1638545
Commit-Queue: Mario Sanchez Prada <mario@igalia.com>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666254}

content/browser/push_messaging/push_messaging_manager.cc

@@ -302,7 +302,6 @@ void PushMessagingManager::BindRequest(
 // -----------------------------------------------------------------------------
 
 void PushMessagingManager::Subscribe(
-    int32_t render_frame_id,
     int64_t service_worker_registration_id,
     const blink::WebPushSubscriptionOptions& options,
     bool user_gesture,

content/browser/push_messaging/push_messaging_manager.h

@@ -50,8 +50,7 @@ class PushMessagingManager : public blink::mojom::PushMessaging {
   }
 
   // blink::mojom::PushMessaging impl, run on IO thread.
-  void Subscribe(int32_t render_frame_id,
-                 int64_t service_worker_registration_id,
+  void Subscribe(int64_t service_worker_registration_id,
                  const blink::WebPushSubscriptionOptions& options,
                  bool user_gesture,
                  SubscribeCallback callback) override;

third_party/blink/public/mojom/push_messaging/push_messaging.mojom

@@ -26,8 +26,7 @@ enum PushErrorType {
 };
 
 interface PushMessaging {
-  Subscribe(int32 render_frame_id,
-            int64 service_worker_registration_id,
+  Subscribe(int64 service_worker_registration_id,
             PushSubscriptionOptions options,
             bool user_gesture)
            => (PushRegistrationStatus status,

third_party/blink/renderer/modules/push_messaging/push_messaging_client.cc

@@ -121,12 +121,8 @@ void PushMessagingClient::DoSubscribe(
     return;
   }
 
-  // We use DocumentInterfaceBroker to communicate with the RenderFrame in the
-  // browser process now, so we don't need to pass a valid ID from here anymore.
-  // TODO: Remove the extra parameter |render_frame_id| from the mojo interface.
   GetService()->Subscribe(
-      -1 /* Invalid ID */, service_worker_registration_id, std::move(options),
-      user_gesture,
+      service_worker_registration_id, std::move(options), user_gesture,
       WTF::Bind(&PushMessagingClient::DidSubscribe, WrapPersistent(this),
                 std::move(callbacks)));
 }

third_party/blink/renderer/modules/push_messaging/push_provider.cc

@@ -91,8 +91,8 @@ void PushProvider::Subscribe(
       mojom::blink::PushSubscriptionOptions::From(&options);
 
   push_messaging_manager_->Subscribe(
-      -1 /* Invalid ID */, GetSupplementable()->RegistrationId(),
-      std::move(content_options_ptr), user_gesture,
+      GetSupplementable()->RegistrationId(), std::move(content_options_ptr),
+      user_gesture,
       WTF::Bind(&PushProvider::DidSubscribe, WrapPersistent(this),
                 WTF::Passed(std::move(callbacks))));
 }