Skip to content

Commit

Permalink
Convert mojo interfaces for devtools_agent to new Mojo types
Browse files Browse the repository at this point in the history
This CL converts DevToolsSessionHost and DevToolsSession
to new Mojo types.

It updates BindDevToolsAgent from frame.mojom,
OnReadyForInspection from embedded_worker.mojom and
OnReadyForInspection from shared_worker_host.mojom
with new Mojo types.

Along with updating mojom interfaces, it also updates
methods and members which take DevToolsAgentPtrInfo,
DevToolsAgentPtr, DevToolsAgentHostRequest,
DevToolsAgentHostAssociatedPtrInfo,
DevToolsAgentAssociatedRequest with new Mojo types.

Bug: 955171, 978694
Change-Id: Ida673d762d4e5bb7dd2696cba28bc681a6f04552
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1748906
Commit-Queue: Julie Kim <jkim@igalia.com>
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686363}
  • Loading branch information
jkim-julie authored and Commit Bot committed Aug 13, 2019
1 parent 5e32b68 commit 0788779
Show file tree
Hide file tree
Showing 25 changed files with 133 additions and 126 deletions.
10 changes: 5 additions & 5 deletions content/browser/devtools/service_worker_devtools_agent_host.cc
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,13 @@ void ServiceWorkerDevToolsAgentHost::DetachSession(DevToolsSession* session) {
}

void ServiceWorkerDevToolsAgentHost::WorkerReadyForInspection(
blink::mojom::DevToolsAgentPtrInfo agent_ptr_info,
blink::mojom::DevToolsAgentHostRequest host_request) {
mojo::PendingRemote<blink::mojom::DevToolsAgent> agent_remote,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost> host_receiver) {
DCHECK_EQ(WORKER_NOT_READY, state_);
state_ = WORKER_READY;
GetRendererChannel()->SetRenderer(std::move(agent_ptr_info),
std::move(host_request), worker_process_id_,
nullptr);
GetRendererChannel()->SetRenderer(std::move(agent_remote),
std::move(host_receiver),
worker_process_id_, nullptr);
for (auto* inspector : protocol::InspectorHandler::ForAgentHost(this))
inspector->TargetReloadedAfterCrash();
if (!sessions().empty())
Expand Down
4 changes: 2 additions & 2 deletions content/browser/devtools/service_worker_devtools_agent_host.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ class ServiceWorkerDevToolsAgentHost : public DevToolsAgentHostImpl {

void WorkerRestarted(int worker_process_id, int worker_route_id);
void WorkerReadyForInspection(
blink::mojom::DevToolsAgentPtrInfo agent_ptr_info,
blink::mojom::DevToolsAgentHostRequest host_request);
mojo::PendingRemote<blink::mojom::DevToolsAgent> agent_remote,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost> host_receiver);
void WorkerDestroyed();
void WorkerVersionInstalled();
void WorkerVersionDoomed();
Expand Down
8 changes: 4 additions & 4 deletions content/browser/devtools/service_worker_devtools_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,16 @@ void ServiceWorkerDevToolsManager::WorkerCreated(
void ServiceWorkerDevToolsManager::WorkerReadyForInspection(
int worker_process_id,
int worker_route_id,
blink::mojom::DevToolsAgentPtrInfo agent_ptr_info,
blink::mojom::DevToolsAgentHostRequest host_request) {
mojo::PendingRemote<blink::mojom::DevToolsAgent> agent_remote,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost> host_receiver) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
const WorkerId worker_id(worker_process_id, worker_route_id);
auto it = live_hosts_.find(worker_id);
if (it == live_hosts_.end())
return;
scoped_refptr<ServiceWorkerDevToolsAgentHost> host = it->second;
host->WorkerReadyForInspection(std::move(agent_ptr_info),
std::move(host_request));
host->WorkerReadyForInspection(std::move(agent_remote),
std::move(host_receiver));
// Bring up UI for the ones not picked by other clients.
if (debug_service_worker_on_start_ && !host->IsAttached())
host->Inspect();
Expand Down
4 changes: 2 additions & 2 deletions content/browser/devtools/service_worker_devtools_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ class CONTENT_EXPORT ServiceWorkerDevToolsManager {
void WorkerReadyForInspection(
int worker_process_id,
int worker_route_id,
blink::mojom::DevToolsAgentPtrInfo agent_ptr_info,
blink::mojom::DevToolsAgentHostRequest host_request);
mojo::PendingRemote<blink::mojom::DevToolsAgent> agent_remote,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost> host_receiver);
void WorkerVersionInstalled(int worker_process_id, int worker_route_id);
void WorkerVersionDoomed(int worker_process_id, int worker_route_id);
void WorkerDestroyed(int worker_process_id, int worker_route_id);
Expand Down
9 changes: 5 additions & 4 deletions content/browser/devtools/shared_worker_devtools_agent_host.cc
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,14 @@ bool SharedWorkerDevToolsAgentHost::Matches(SharedWorkerHost* worker_host) {
}

void SharedWorkerDevToolsAgentHost::WorkerReadyForInspection(
blink::mojom::DevToolsAgentPtr agent_ptr,
blink::mojom::DevToolsAgentHostRequest agent_host_request) {
mojo::PendingRemote<blink::mojom::DevToolsAgent> agent_remote,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost>
agent_host_receiver) {
DCHECK_EQ(WORKER_NOT_READY, state_);
DCHECK(worker_host_);
state_ = WORKER_READY;
GetRendererChannel()->SetRenderer(agent_ptr.PassInterface(),
std::move(agent_host_request),
GetRendererChannel()->SetRenderer(std::move(agent_remote),
std::move(agent_host_receiver),
worker_host_->worker_process_id(), nullptr);
for (auto* inspector : protocol::InspectorHandler::ForAgentHost(this))
inspector->TargetReloadedAfterCrash();
Expand Down
5 changes: 3 additions & 2 deletions content/browser/devtools/shared_worker_devtools_agent_host.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ class SharedWorkerDevToolsAgentHost : public DevToolsAgentHostImpl {

bool Matches(SharedWorkerHost* worker_host);
void WorkerReadyForInspection(
blink::mojom::DevToolsAgentPtr agent_ptr,
blink::mojom::DevToolsAgentHostRequest agent_host_request);
mojo::PendingRemote<blink::mojom::DevToolsAgent> agent_remote,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost>
agent_host_receiver);
void WorkerRestarted(SharedWorkerHost* worker_host);
void WorkerDestroyed();

Expand Down
7 changes: 4 additions & 3 deletions content/browser/devtools/shared_worker_devtools_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,12 @@ void SharedWorkerDevToolsManager::WorkerCreated(

void SharedWorkerDevToolsManager::WorkerReadyForInspection(
SharedWorkerHost* worker_host,
blink::mojom::DevToolsAgentPtr agent_ptr,
blink::mojom::DevToolsAgentHostRequest agent_host_request) {
mojo::PendingRemote<blink::mojom::DevToolsAgent> agent_remote,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost>
agent_host_receiver) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
live_hosts_[worker_host]->WorkerReadyForInspection(
std::move(agent_ptr), std::move(agent_host_request));
std::move(agent_remote), std::move(agent_host_receiver));
}

void SharedWorkerDevToolsManager::WorkerDestroyed(
Expand Down
5 changes: 3 additions & 2 deletions content/browser/devtools/shared_worker_devtools_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ class CONTENT_EXPORT SharedWorkerDevToolsManager {
base::UnguessableToken* devtools_worker_token);
void WorkerReadyForInspection(
SharedWorkerHost* worker_host,
blink::mojom::DevToolsAgentPtr agent_ptr,
blink::mojom::DevToolsAgentHostRequest agent_host_request);
mojo::PendingRemote<blink::mojom::DevToolsAgent> agent_remote,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost>
agent_host_receiver);
void WorkerDestroyed(SharedWorkerHost* worker_host);

private:
Expand Down
6 changes: 3 additions & 3 deletions content/browser/frame_host/render_frame_host_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5607,10 +5607,10 @@ void RenderFrameHostImpl::CancelBlockedRequestsForFrame() {
}

void RenderFrameHostImpl::BindDevToolsAgent(
blink::mojom::DevToolsAgentHostAssociatedPtrInfo host,
blink::mojom::DevToolsAgentAssociatedRequest request) {
mojo::PendingAssociatedRemote<blink::mojom::DevToolsAgentHost> host,
mojo::PendingAssociatedReceiver<blink::mojom::DevToolsAgent> receiver) {
GetNavigationControl()->BindDevToolsAgent(std::move(host),
std::move(request));
std::move(receiver));
}

bool RenderFrameHostImpl::IsSameSiteInstance(
Expand Down
5 changes: 3 additions & 2 deletions content/browser/frame_host/render_frame_host_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -801,8 +801,9 @@ class CONTENT_EXPORT RenderFrameHostImpl
void CancelBlockedRequestsForFrame();

// Binds a DevToolsAgent interface for debugging.
void BindDevToolsAgent(blink::mojom::DevToolsAgentHostAssociatedPtrInfo host,
blink::mojom::DevToolsAgentAssociatedRequest request);
void BindDevToolsAgent(
mojo::PendingAssociatedRemote<blink::mojom::DevToolsAgentHost> host,
mojo::PendingAssociatedReceiver<blink::mojom::DevToolsAgent> receiver);

#if defined(OS_ANDROID)
base::android::ScopedJavaLocalRef<jobject> GetJavaRenderFrameHost();
Expand Down
24 changes: 12 additions & 12 deletions content/browser/service_worker/embedded_worker_instance.cc
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ const char kServiceWorkerTerminationCanceledMesage[] =
void NotifyWorkerReadyForInspectionOnUI(
int worker_process_id,
int worker_route_id,
blink::mojom::DevToolsAgentPtrInfo agent_ptr_info,
blink::mojom::DevToolsAgentHostRequest host_request) {
mojo::PendingRemote<blink::mojom::DevToolsAgent> agent_remote,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost> host_receiver) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
ServiceWorkerDevToolsManager::GetInstance()->WorkerReadyForInspection(
worker_process_id, worker_route_id, std::move(agent_ptr_info),
std::move(host_request));
worker_process_id, worker_route_id, std::move(agent_remote),
std::move(host_receiver));
}

void NotifyWorkerDestroyedOnUI(int worker_process_id, int worker_route_id) {
Expand Down Expand Up @@ -306,14 +306,14 @@ class EmbeddedWorkerInstance::DevToolsProxy {
}

void NotifyWorkerReadyForInspection(
blink::mojom::DevToolsAgentPtrInfo agent_ptr_info,
blink::mojom::DevToolsAgentHostRequest host_request) {
mojo::PendingRemote<blink::mojom::DevToolsAgent> agent_remote,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost> host_receiver) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
ui_task_runner_->PostTask(
FROM_HERE,
base::BindOnce(NotifyWorkerReadyForInspectionOnUI, process_id_,
agent_route_id_, std::move(agent_ptr_info),
std::move(host_request)));
agent_route_id_, std::move(agent_remote),
std::move(host_receiver)));
}

void NotifyWorkerVersionInstalled() {
Expand Down Expand Up @@ -821,12 +821,12 @@ void EmbeddedWorkerInstance::CountFeature(blink::mojom::WebFeature feature) {
}

void EmbeddedWorkerInstance::OnReadyForInspection(
blink::mojom::DevToolsAgentPtr agent_ptr,
blink::mojom::DevToolsAgentHostRequest host_request) {
mojo::PendingRemote<blink::mojom::DevToolsAgent> agent_remote,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost> host_receiver) {
if (!devtools_proxy_)
return;
devtools_proxy_->NotifyWorkerReadyForInspection(agent_ptr.PassInterface(),
std::move(host_request));
devtools_proxy_->NotifyWorkerReadyForInspection(std::move(agent_remote),
std::move(host_receiver));
}

void EmbeddedWorkerInstance::OnScriptReadStarted() {
Expand Down
5 changes: 3 additions & 2 deletions content/browser/service_worker/embedded_worker_instance.h
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,9 @@ class CONTENT_EXPORT EmbeddedWorkerInstance
// These functions all run on the IO thread.
void RequestTermination(RequestTerminationCallback callback) override;
void CountFeature(blink::mojom::WebFeature feature) override;
void OnReadyForInspection(blink::mojom::DevToolsAgentPtr,
blink::mojom::DevToolsAgentHostRequest) override;
void OnReadyForInspection(
mojo::PendingRemote<blink::mojom::DevToolsAgent>,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost>) override;
void OnScriptLoaded() override;
void OnScriptEvaluationStart() override;
// Changes the internal worker status from STARTING to RUNNING.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,18 @@ void FakeEmbeddedWorkerInstanceClient::StartWorker(
helper_->OnServiceWorkerRequest(
std::move(start_params_->service_worker_request));

// Create message pipes. We may need to keep |devtools_agent_request| and
// |devtools_agent_host_ptr_info| if we want not to invoke
// Create message pipes. We may need to keep |devtools_agent_receiver| and
// |devtools_agent_host_remote| if we want not to invoke
// connection error handlers.

blink::mojom::DevToolsAgentPtr devtools_agent_ptr;
blink::mojom::DevToolsAgentRequest devtools_agent_request =
mojo::MakeRequest(&devtools_agent_ptr);
mojo::PendingRemote<blink::mojom::DevToolsAgent> devtools_agent_remote;
mojo::PendingReceiver<blink::mojom::DevToolsAgent> devtools_agent_receiver =
devtools_agent_remote.InitWithNewPipeAndPassReceiver();

blink::mojom::DevToolsAgentHostPtrInfo devtools_agent_host_ptr_info;
blink::mojom::DevToolsAgentHostRequest devtools_agent_host_request =
mojo::MakeRequest(&devtools_agent_host_ptr_info);

host_->OnReadyForInspection(std::move(devtools_agent_ptr),
std::move(devtools_agent_host_request));
mojo::Remote<blink::mojom::DevToolsAgentHost> devtools_agent_host_remote;
host_->OnReadyForInspection(
std::move(devtools_agent_remote),
devtools_agent_host_remote.BindNewPipeAndPassReceiver());

if (start_params_->is_installed) {
EvaluateScript();
Expand Down
16 changes: 9 additions & 7 deletions content/browser/worker_host/shared_worker_host.cc
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@ class SharedWorkerHost::ScopedDevToolsHandle {
}

void WorkerReadyForInspection(
blink::mojom::DevToolsAgentPtr agent_ptr,
blink::mojom::DevToolsAgentHostRequest agent_host_request) {
mojo::PendingRemote<blink::mojom::DevToolsAgent> agent_remote,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost>
agent_host_receiver) {
SharedWorkerDevToolsManager::GetInstance()->WorkerReadyForInspection(
owner_, std::move(agent_ptr), std::move(agent_host_request));
owner_, std::move(agent_remote), std::move(agent_host_receiver));
}

private:
Expand Down Expand Up @@ -402,11 +403,12 @@ void SharedWorkerHost::OnContextClosed() {
}

void SharedWorkerHost::OnReadyForInspection(
blink::mojom::DevToolsAgentPtr agent_ptr,
blink::mojom::DevToolsAgentHostRequest agent_host_request) {
mojo::PendingRemote<blink::mojom::DevToolsAgent> agent_remote,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost>
agent_host_receiver) {
if (devtools_handle_) {
devtools_handle_->WorkerReadyForInspection(std::move(agent_ptr),
std::move(agent_host_request));
devtools_handle_->WorkerReadyForInspection(std::move(agent_remote),
std::move(agent_host_receiver));
}
}

Expand Down
5 changes: 3 additions & 2 deletions content/browser/worker_host/shared_worker_host.h
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,9 @@ class CONTENT_EXPORT SharedWorkerHost
// blink::mojom::SharedWorkerHost methods:
void OnConnected(int connection_request_id) override;
void OnContextClosed() override;
void OnReadyForInspection(blink::mojom::DevToolsAgentPtr,
blink::mojom::DevToolsAgentHostRequest) override;
void OnReadyForInspection(
mojo::PendingRemote<blink::mojom::DevToolsAgent>,
mojo::PendingReceiver<blink::mojom::DevToolsAgentHost>) override;
void OnScriptLoadFailed() override;
void OnFeatureUsed(blink::mojom::WebFeature feature) override;

Expand Down
22 changes: 11 additions & 11 deletions content/browser/worker_host/shared_worker_host_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -171,17 +171,17 @@ TEST_F(SharedWorkerHostTest, Normal) {
EXPECT_TRUE(client.CheckReceivedOnCreated());
// Simulate events the shared worker would send.

// Create message pipes. We may need to keep |devtools_agent_request| and
// |devtools_agent_host_ptr_info| if we want not to invoke
// connection error handlers.
blink::mojom::DevToolsAgentPtr devtools_agent_ptr;
blink::mojom::DevToolsAgentRequest devtools_agent_request =
mojo::MakeRequest(&devtools_agent_ptr);
blink::mojom::DevToolsAgentHostPtrInfo devtools_agent_host_ptr_info;
blink::mojom::DevToolsAgentHostRequest devtools_agent_host_request =
mojo::MakeRequest(&devtools_agent_host_ptr_info);
worker_host->OnReadyForInspection(std::move(devtools_agent_ptr),
std::move(devtools_agent_host_request));
// Create message pipes. We may need to keep |devtools_agent_receiver| and
// |devtools_agent_host_remote| if we want not to invoke connection error
// handlers.
mojo::PendingRemote<blink::mojom::DevToolsAgent> devtools_agent_remote;
mojo::PendingReceiver<blink::mojom::DevToolsAgent> devtools_agent_receiver =
devtools_agent_remote.InitWithNewPipeAndPassReceiver();
mojo::PendingRemote<blink::mojom::DevToolsAgentHost>
devtools_agent_host_remote;
worker_host->OnReadyForInspection(
std::move(devtools_agent_remote),
devtools_agent_host_remote.InitWithNewPipeAndPassReceiver());

worker_host->OnConnected(connection_request_id);
base::RunLoop().RunUntilIdle();
Expand Down
44 changes: 22 additions & 22 deletions content/browser/worker_host/shared_worker_service_impl_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -232,17 +232,17 @@ TEST_F(SharedWorkerServiceImplTest, BasicTest) {

// Simulate events the shared worker would send.

// Create message pipes. We may need to keep |devtools_agent_request| and
// |devtools_agent_host_ptr_info| if we want not to invoke
// connection error handlers.
blink::mojom::DevToolsAgentPtr devtools_agent_ptr;
blink::mojom::DevToolsAgentRequest devtools_agent_request =
mojo::MakeRequest(&devtools_agent_ptr);
blink::mojom::DevToolsAgentHostPtrInfo devtools_agent_host_ptr_info;
blink::mojom::DevToolsAgentHostRequest devtools_agent_host_request =
mojo::MakeRequest(&devtools_agent_host_ptr_info);
worker_host->OnReadyForInspection(std::move(devtools_agent_ptr),
std::move(devtools_agent_host_request));
// Create message pipes. We may need to keep |devtools_agent_receiver| and
// |devtools_agent_host_remote| if we want not to invoke connection error
// handlers.
mojo::PendingRemote<blink::mojom::DevToolsAgent> devtools_agent_remote;
mojo::PendingReceiver<blink::mojom::DevToolsAgent> devtools_agent_receiver =
devtools_agent_remote.InitWithNewPipeAndPassReceiver();
mojo::PendingRemote<blink::mojom::DevToolsAgentHost>
devtools_agent_host_remote;
worker_host->OnReadyForInspection(
std::move(devtools_agent_remote),
devtools_agent_host_remote.InitWithNewPipeAndPassReceiver());

worker_host->OnConnected(connection_request_id);

Expand Down Expand Up @@ -320,17 +320,17 @@ TEST_F(SharedWorkerServiceImplTest, TwoRendererTest) {

// Simulate events the shared worker would send.

// Create message pipes. We may need to keep |devtools_agent_request| and
// |devtools_agent_host_ptr_info| if we want not to invoke
// connection error handlers.
blink::mojom::DevToolsAgentPtr devtools_agent_ptr;
blink::mojom::DevToolsAgentRequest devtools_agent_request =
mojo::MakeRequest(&devtools_agent_ptr);
blink::mojom::DevToolsAgentHostPtrInfo devtools_agent_host_ptr_info;
blink::mojom::DevToolsAgentHostRequest devtools_agent_host_request =
mojo::MakeRequest(&devtools_agent_host_ptr_info);
worker_host->OnReadyForInspection(std::move(devtools_agent_ptr),
std::move(devtools_agent_host_request));
// Create message pipes. We may need to keep |devtools_agent_receiver| and
// |devtools_agent_host_remote| if we want not to invoke connection error
// handlers.
mojo::PendingRemote<blink::mojom::DevToolsAgent> devtools_agent_remote;
mojo::PendingReceiver<blink::mojom::DevToolsAgent> devtools_agent_receiver =
devtools_agent_remote.InitWithNewPipeAndPassReceiver();
mojo::PendingRemote<blink::mojom::DevToolsAgentHost>
devtools_agent_host_remote;
worker_host->OnReadyForInspection(
std::move(devtools_agent_remote),
devtools_agent_host_remote.InitWithNewPipeAndPassReceiver());
worker_host->OnConnected(connection_request_id0);

base::RunLoop().RunUntilIdle();
Expand Down
5 changes: 3 additions & 2 deletions content/common/frame.mojom
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,9 @@ interface FrameNavigationControl {
// Returned DevToolsAgent must be associated with navigation control,
// due to various ordering dependencies between DevTools protocol and
// navigation.
BindDevToolsAgent(associated blink.mojom.DevToolsAgentHost agent_host,
associated blink.mojom.DevToolsAgent& agent);
BindDevToolsAgent(
pending_associated_remote<blink.mojom.DevToolsAgentHost> agent_host,
pending_associated_receiver<blink.mojom.DevToolsAgent> agent);

// Request for the renderer to execute JavaScript in the frame's context.
//
Expand Down
6 changes: 3 additions & 3 deletions content/renderer/render_frame_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4051,9 +4051,9 @@ void RenderFrameImpl::MarkInitiatorAsRequiringSeparateURLLoaderFactory(
}

void RenderFrameImpl::BindDevToolsAgent(
blink::mojom::DevToolsAgentHostAssociatedPtrInfo host,
blink::mojom::DevToolsAgentAssociatedRequest request) {
frame_->BindDevToolsAgent(host.PassHandle(), request.PassHandle());
mojo::PendingAssociatedRemote<blink::mojom::DevToolsAgentHost> host,
mojo::PendingAssociatedReceiver<blink::mojom::DevToolsAgent> receiver) {
frame_->BindDevToolsAgent(host.PassHandle(), receiver.PassHandle());
}

// mojom::HostZoom implementation ----------------------------------------------
Expand Down

0 comments on commit 0788779

Please sign in to comment.