Commit 199a5416 authored by Gyuyoung Kim's avatar Gyuyoung Kim Committed by Commit Bot

Clean up the last old use of P2PSocketManager interface

This CL converts P2PSocketManagerRequest to
PendingReceiver<P2PSocketManager> as well as renames
BindRequest to BindReceiver.

Bug: 955171
Change-Id: I11f552f9615fad2bfa0f04e5bb69394a3126ad7b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1954818Reviewed-by: default avatarKen Rockot <rockot@google.com>
Reviewed-by: default avatarKen Buchanan <kenrb@chromium.org>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#722686}
parent f6661749
...@@ -63,8 +63,8 @@ void P2PSocketDispatcherHost::StopRtpDump(bool incoming, bool outgoing) { ...@@ -63,8 +63,8 @@ void P2PSocketDispatcherHost::StopRtpDump(bool incoming, bool outgoing) {
} }
} }
void P2PSocketDispatcherHost::BindRequest( void P2PSocketDispatcherHost::BindReceiver(
network::mojom::P2PSocketManagerRequest request) { mojo::PendingReceiver<network::mojom::P2PSocketManager> receiver) {
auto* rph = RenderProcessHostImpl::FromID(render_process_id_); auto* rph = RenderProcessHostImpl::FromID(render_process_id_);
if (!rph) if (!rph)
return; return;
...@@ -77,7 +77,8 @@ void P2PSocketDispatcherHost::BindRequest( ...@@ -77,7 +77,8 @@ void P2PSocketDispatcherHost::BindRequest(
trusted_socket_manager_.reset(); trusted_socket_manager_.reset();
rph->GetStoragePartition()->GetNetworkContext()->CreateP2PSocketManager( rph->GetStoragePartition()->GetNetworkContext()->CreateP2PSocketManager(
std::move(trusted_socket_manager_client), std::move(trusted_socket_manager_client),
trusted_socket_manager_.BindNewPipeAndPassReceiver(), std::move(request)); trusted_socket_manager_.BindNewPipeAndPassReceiver(),
std::move(receiver));
if (dump_incoming_rtp_packet_ || dump_outgoing_rtp_packet_) { if (dump_incoming_rtp_packet_ || dump_outgoing_rtp_packet_) {
trusted_socket_manager_->StartRtpDump(dump_incoming_rtp_packet_, trusted_socket_manager_->StartRtpDump(dump_incoming_rtp_packet_,
dump_outgoing_rtp_packet_); dump_outgoing_rtp_packet_);
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "base/sequenced_task_runner.h" #include "base/sequenced_task_runner.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/bindings/remote.h" #include "mojo/public/cpp/bindings/remote.h"
#include "services/network/public/mojom/p2p.mojom.h" #include "services/network/public/mojom/p2p.mojom.h"
...@@ -39,7 +40,8 @@ class P2PSocketDispatcherHost ...@@ -39,7 +40,8 @@ class P2PSocketDispatcherHost
// Stops the RTP packet header dumping. // Stops the RTP packet header dumping.
void StopRtpDump(bool incoming, bool outgoing); void StopRtpDump(bool incoming, bool outgoing);
void BindRequest(network::mojom::P2PSocketManagerRequest request); void BindReceiver(
mojo::PendingReceiver<network::mojom::P2PSocketManager> receiver);
base::WeakPtr<P2PSocketDispatcherHost> GetWeakPtr(); base::WeakPtr<P2PSocketDispatcherHost> GetWeakPtr();
......
...@@ -2255,7 +2255,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { ...@@ -2255,7 +2255,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
AddUIThreadInterface( AddUIThreadInterface(
registry.get(), registry.get(),
base::BindRepeating(&P2PSocketDispatcherHost::BindRequest, base::BindRepeating(&P2PSocketDispatcherHost::BindReceiver,
base::Unretained(p2p_socket_dispatcher_host_.get()))); base::Unretained(p2p_socket_dispatcher_host_.get())));
#if BUILDFLAG(ENABLE_MDNS) #if BUILDFLAG(ENABLE_MDNS)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment