Convert RenderFrameMetadataObserverClient to new Mojo types
This CL converts RenderFrameMetadataObserverClientRequest,
RenderFrameMetadataObserverClientPtr, and
RenderFrameMetadataObserverClientPtrInfo to new
Mojo types.
It also updates RegisterRenderFrameMetadataObserver
from frame_sink_provider.mojom and methods and members
which implements it with new Mojo types.
Bug: 955171
Change-Id: I1f1fefe865bff8e29b47f437b699e6ac55612881
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1795524
Commit-Queue: Julie Kim <[email protected]>
Reviewed-by: Oksana Zhuravlova <[email protected]>
Reviewed-by: Sam McNally <[email protected]>
Reviewed-by: Matt Falkenhagen <[email protected]>
Cr-Commit-Position: refs/heads/master@{#695504}
diff --git a/content/browser/renderer_host/frame_sink_provider_impl.cc b/content/browser/renderer_host/frame_sink_provider_impl.cc
index 47ea521..919a8771 100644
--- a/content/browser/renderer_host/frame_sink_provider_impl.cc
+++ b/content/browser/renderer_host/frame_sink_provider_impl.cc
@@ -43,8 +43,8 @@
void FrameSinkProviderImpl::RegisterRenderFrameMetadataObserver(
int32_t widget_id,
- mojom::RenderFrameMetadataObserverClientRequest
- render_frame_metadata_observer_client_request,
+ mojo::PendingReceiver<mojom::RenderFrameMetadataObserverClient>
+ render_frame_metadata_observer_client_receiver,
mojo::PendingRemote<mojom::RenderFrameMetadataObserver>
render_frame_metadata_observer) {
RenderWidgetHostImpl* render_widget_host_impl =
@@ -55,7 +55,7 @@
return;
}
render_widget_host_impl->RegisterRenderFrameMetadataObserver(
- std::move(render_frame_metadata_observer_client_request),
+ std::move(render_frame_metadata_observer_client_receiver),
std::move(render_frame_metadata_observer));
}
diff --git a/content/browser/renderer_host/frame_sink_provider_impl.h b/content/browser/renderer_host/frame_sink_provider_impl.h
index c90fb47..f59dee4 100644
--- a/content/browser/renderer_host/frame_sink_provider_impl.h
+++ b/content/browser/renderer_host/frame_sink_provider_impl.h
@@ -31,8 +31,8 @@
override;
void RegisterRenderFrameMetadataObserver(
int32_t widget_id,
- mojom::RenderFrameMetadataObserverClientRequest
- render_frame_metadata_observer_client_request,
+ mojo::PendingReceiver<mojom::RenderFrameMetadataObserverClient>
+ render_frame_metadata_observer_client_receiver,
mojo::PendingRemote<mojom::RenderFrameMetadataObserver> observer)
override;
diff --git a/content/browser/renderer_host/render_frame_metadata_provider_impl.cc b/content/browser/renderer_host/render_frame_metadata_provider_impl.cc
index 527a9e64..498d3330 100644
--- a/content/browser/renderer_host/render_frame_metadata_provider_impl.cc
+++ b/content/browser/renderer_host/render_frame_metadata_provider_impl.cc
@@ -13,8 +13,7 @@
scoped_refptr<base::SingleThreadTaskRunner> task_runner,
FrameTokenMessageQueue* frame_token_message_queue)
: task_runner_(task_runner),
- frame_token_message_queue_(frame_token_message_queue),
- render_frame_metadata_observer_client_binding_(this) {}
+ frame_token_message_queue_(frame_token_message_queue) {}
RenderFrameMetadataProviderImpl::~RenderFrameMetadataProviderImpl() = default;
@@ -27,13 +26,14 @@
}
void RenderFrameMetadataProviderImpl::Bind(
- mojom::RenderFrameMetadataObserverClientRequest client_request,
+ mojo::PendingReceiver<mojom::RenderFrameMetadataObserverClient>
+ client_receiver,
mojo::PendingRemote<mojom::RenderFrameMetadataObserver> observer) {
render_frame_metadata_observer_remote_.reset();
render_frame_metadata_observer_remote_.Bind(std::move(observer));
- render_frame_metadata_observer_client_binding_.Close();
- render_frame_metadata_observer_client_binding_.Bind(std::move(client_request),
- task_runner_);
+ render_frame_metadata_observer_client_receiver_.reset();
+ render_frame_metadata_observer_client_receiver_.Bind(
+ std::move(client_receiver), task_runner_);
#if defined(OS_ANDROID)
if (pending_report_all_root_scrolls_for_accessibility_.has_value()) {
diff --git a/content/browser/renderer_host/render_frame_metadata_provider_impl.h b/content/browser/renderer_host/render_frame_metadata_provider_impl.h
index 10455e9..9c0f9c8 100644
--- a/content/browser/renderer_host/render_frame_metadata_provider_impl.h
+++ b/content/browser/renderer_host/render_frame_metadata_provider_impl.h
@@ -11,8 +11,9 @@
#include "build/build_config.h"
#include "content/common/render_frame_metadata.mojom.h"
#include "content/public/browser/render_frame_metadata_provider.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
namespace content {
@@ -38,7 +39,8 @@
void AddObserver(Observer* observer) override;
void RemoveObserver(Observer* observer) override;
- void Bind(mojom::RenderFrameMetadataObserverClientRequest client_request,
+ void Bind(mojo::PendingReceiver<mojom::RenderFrameMetadataObserverClient>
+ client_receiver,
mojo::PendingRemote<mojom::RenderFrameMetadataObserver> observer);
const cc::RenderFrameMetadata& LastRenderFrameMetadata() override;
@@ -86,8 +88,8 @@
// Not owned.
FrameTokenMessageQueue* const frame_token_message_queue_;
- mojo::Binding<mojom::RenderFrameMetadataObserverClient>
- render_frame_metadata_observer_client_binding_;
+ mojo::Receiver<mojom::RenderFrameMetadataObserverClient>
+ render_frame_metadata_observer_client_receiver_{this};
mojo::Remote<mojom::RenderFrameMetadataObserver>
render_frame_metadata_observer_remote_;
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 290200a..ce5c2c9 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -2960,12 +2960,12 @@
}
void RenderWidgetHostImpl::RegisterRenderFrameMetadataObserver(
- mojom::RenderFrameMetadataObserverClientRequest
- render_frame_metadata_observer_client_request,
+ mojo::PendingReceiver<mojom::RenderFrameMetadataObserverClient>
+ render_frame_metadata_observer_client_receiver,
mojo::PendingRemote<mojom::RenderFrameMetadataObserver>
render_frame_metadata_observer) {
render_frame_metadata_provider_.Bind(
- std::move(render_frame_metadata_observer_client_request),
+ std::move(render_frame_metadata_observer_client_receiver),
std::move(render_frame_metadata_observer));
}
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
index 49eaed1..5445df9 100644
--- a/content/browser/renderer_host/render_widget_host_impl.h
+++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -58,6 +58,7 @@
#include "ipc/ipc_listener.h"
#include "mojo/public/cpp/bindings/associated_remote.h"
#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
@@ -651,8 +652,8 @@
viz::mojom::CompositorFrameSinkClientPtr compositor_frame_sink_client);
void RegisterRenderFrameMetadataObserver(
- mojom::RenderFrameMetadataObserverClientRequest
- render_frame_metadata_observer_client_request,
+ mojo::PendingReceiver<mojom::RenderFrameMetadataObserverClient>
+ render_frame_metadata_observer_client_receiver,
mojo::PendingRemote<mojom::RenderFrameMetadataObserver>
render_frame_metadata_observer);
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index d9638ea..28653b1 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -266,14 +266,15 @@
// Fake out the renderer side of mojom::RenderFrameMetadataObserver, allowing
// for RenderWidgetHostImpl to be created.
//
-// All methods are no-opts, the provided mojo request and info are held, but
+// All methods are no-opts, the provided mojo receiver and remote are held, but
// never bound.
class FakeRenderFrameMetadataObserver
: public mojom::RenderFrameMetadataObserver {
public:
FakeRenderFrameMetadataObserver(
mojo::PendingReceiver<mojom::RenderFrameMetadataObserver> receiver,
- mojom::RenderFrameMetadataObserverClientPtrInfo client_info);
+ mojo::PendingRemote<mojom::RenderFrameMetadataObserverClient>
+ client_remote);
~FakeRenderFrameMetadataObserver() override {}
#if defined(OS_ANDROID)
@@ -283,14 +284,15 @@
private:
mojo::PendingReceiver<mojom::RenderFrameMetadataObserver> receiver_;
- mojom::RenderFrameMetadataObserverClientPtrInfo client_info_;
+ mojo::PendingRemote<mojom::RenderFrameMetadataObserverClient> client_remote_;
DISALLOW_COPY_AND_ASSIGN(FakeRenderFrameMetadataObserver);
};
FakeRenderFrameMetadataObserver::FakeRenderFrameMetadataObserver(
mojo::PendingReceiver<mojom::RenderFrameMetadataObserver> receiver,
- mojom::RenderFrameMetadataObserverClientPtrInfo client_info)
- : receiver_(std::move(receiver)), client_info_(std::move(client_info)) {}
+ mojo::PendingRemote<mojom::RenderFrameMetadataObserverClient> client_remote)
+ : receiver_(std::move(receiver)),
+ client_remote_(std::move(client_remote)) {}
// MockRenderWidgetHostDelegate --------------------------------------------
@@ -509,22 +511,23 @@
mojo::PendingRemote<mojom::RenderFrameMetadataObserver>
renderer_render_frame_metadata_observer_remote;
- mojom::RenderFrameMetadataObserverClientPtrInfo
- render_frame_metadata_observer_client_info;
- mojom::RenderFrameMetadataObserverClientRequest
- render_frame_metadata_observer_client_request =
- mojo::MakeRequest(&render_frame_metadata_observer_client_info);
+ mojo::PendingRemote<mojom::RenderFrameMetadataObserverClient>
+ render_frame_metadata_observer_remote;
+ mojo::PendingReceiver<mojom::RenderFrameMetadataObserverClient>
+ render_frame_metadata_observer_client_receiver =
+ render_frame_metadata_observer_remote
+ .InitWithNewPipeAndPassReceiver();
renderer_render_frame_metadata_observer_ =
std::make_unique<FakeRenderFrameMetadataObserver>(
renderer_render_frame_metadata_observer_remote
.InitWithNewPipeAndPassReceiver(),
- std::move(render_frame_metadata_observer_client_info));
+ std::move(render_frame_metadata_observer_remote));
host_->RequestCompositorFrameSink(
std::move(sink_request),
std::move(renderer_compositor_frame_sink_ptr_));
host_->RegisterRenderFrameMetadataObserver(
- std::move(render_frame_metadata_observer_client_request),
+ std::move(render_frame_metadata_observer_client_receiver),
std::move(renderer_render_frame_metadata_observer_remote));
}
diff --git a/content/common/frame_sink_provider.mojom b/content/common/frame_sink_provider.mojom
index f82a4f91..3b75486 100644
--- a/content/common/frame_sink_provider.mojom
+++ b/content/common/frame_sink_provider.mojom
@@ -19,8 +19,8 @@
RegisterRenderFrameMetadataObserver(
int32 widget_id,
- RenderFrameMetadataObserverClient&
- render_frame_metadata_observer_client_request,
+ pending_receiver<RenderFrameMetadataObserverClient>
+ render_frame_metadata_observer_client_receiver,
pending_remote<RenderFrameMetadataObserver>
render_frame_metadata_observer);
};
diff --git a/content/renderer/compositor/compositor_dependencies.h b/content/renderer/compositor/compositor_dependencies.h
index aa8dbbc7..9ce2b02 100644
--- a/content/renderer/compositor/compositor_dependencies.h
+++ b/content/renderer/compositor/compositor_dependencies.h
@@ -12,6 +12,7 @@
#include "components/viz/common/display/renderer_settings.h"
#include "content/common/content_export.h"
#include "content/common/render_frame_metadata.mojom.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
class GURL;
@@ -64,8 +65,8 @@
scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue,
const GURL& url,
LayerTreeFrameSinkCallback callback,
- mojom::RenderFrameMetadataObserverClientRequest
- render_frame_metadata_observer_client_request,
+ mojo::PendingReceiver<mojom::RenderFrameMetadataObserverClient>
+ render_frame_metadata_observer_client_receiver,
mojo::PendingRemote<mojom::RenderFrameMetadataObserver>
render_frame_metadata_observer_remote,
const char* client_name) = 0;
diff --git a/content/renderer/render_frame_metadata_observer_impl.cc b/content/renderer/render_frame_metadata_observer_impl.cc
index 58df056..cf7841a 100644
--- a/content/renderer/render_frame_metadata_observer_impl.cc
+++ b/content/renderer/render_frame_metadata_observer_impl.cc
@@ -19,15 +19,16 @@
RenderFrameMetadataObserverImpl::RenderFrameMetadataObserverImpl(
mojo::PendingReceiver<mojom::RenderFrameMetadataObserver> receiver,
- mojom::RenderFrameMetadataObserverClientPtrInfo client_info)
- : receiver_(std::move(receiver)), client_info_(std::move(client_info)) {}
+ mojo::PendingRemote<mojom::RenderFrameMetadataObserverClient> client_remote)
+ : receiver_(std::move(receiver)),
+ client_remote_(std::move(client_remote)) {}
RenderFrameMetadataObserverImpl::~RenderFrameMetadataObserverImpl() {}
void RenderFrameMetadataObserverImpl::BindToCurrentThread() {
DCHECK(receiver_.is_valid());
render_frame_metadata_observer_receiver_.Bind(std::move(receiver_));
- render_frame_metadata_observer_client_.Bind(std::move(client_info_));
+ render_frame_metadata_observer_client_.Bind(std::move(client_remote_));
}
void RenderFrameMetadataObserverImpl::OnRenderFrameSubmission(
diff --git a/content/renderer/render_frame_metadata_observer_impl.h b/content/renderer/render_frame_metadata_observer_impl.h
index 53b565f..f253f7b82 100644
--- a/content/renderer/render_frame_metadata_observer_impl.h
+++ b/content/renderer/render_frame_metadata_observer_impl.h
@@ -11,7 +11,9 @@
#include "content/common/content_export.h"
#include "content/common/render_frame_metadata.mojom.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/receiver.h"
+#include "mojo/public/cpp/bindings/remote.h"
namespace content {
@@ -30,7 +32,8 @@
public:
RenderFrameMetadataObserverImpl(
mojo::PendingReceiver<mojom::RenderFrameMetadataObserver> receiver,
- mojom::RenderFrameMetadataObserverClientPtrInfo client_info);
+ mojo::PendingRemote<mojom::RenderFrameMetadataObserverClient>
+ client_remote);
~RenderFrameMetadataObserverImpl() override;
// cc::RenderFrameMetadataObserver:
@@ -76,11 +79,11 @@
// These are destroyed when BindToCurrentThread() is called.
mojo::PendingReceiver<mojom::RenderFrameMetadataObserver> receiver_;
- mojom::RenderFrameMetadataObserverClientPtrInfo client_info_;
+ mojo::PendingRemote<mojom::RenderFrameMetadataObserverClient> client_remote_;
mojo::Receiver<mojom::RenderFrameMetadataObserver>
render_frame_metadata_observer_receiver_{this};
- mojom::RenderFrameMetadataObserverClientPtr
+ mojo::Remote<mojom::RenderFrameMetadataObserverClient>
render_frame_metadata_observer_client_;
DISALLOW_COPY_AND_ASSIGN(RenderFrameMetadataObserverImpl);
diff --git a/content/renderer/render_frame_metadata_observer_impl_unittest.cc b/content/renderer/render_frame_metadata_observer_impl_unittest.cc
index 3663d7a1..0883bde 100644
--- a/content/renderer/render_frame_metadata_observer_impl_unittest.cc
+++ b/content/renderer/render_frame_metadata_observer_impl_unittest.cc
@@ -11,6 +11,7 @@
#include "components/viz/common/quads/compositor_frame_metadata.h"
#include "content/common/render_frame_metadata.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -29,11 +30,12 @@
: public mojom::RenderFrameMetadataObserverClient {
public:
MockRenderFrameMetadataObserverClient(
- mojom::RenderFrameMetadataObserverClientRequest client_request,
+ mojo::PendingReceiver<mojom::RenderFrameMetadataObserverClient>
+ client_receiver,
mojo::PendingRemote<mojom::RenderFrameMetadataObserver> observer)
: render_frame_metadata_observer_client_binding_(
this,
- std::move(client_request)),
+ std::move(client_receiver)),
render_frame_metadata_observer_remote_(std::move(observer)) {}
MOCK_METHOD2(OnRenderFrameMetadataChanged,
@@ -64,15 +66,14 @@
mojo::PendingRemote<mojom::RenderFrameMetadataObserver> observer_remote;
mojo::PendingReceiver<mojom::RenderFrameMetadataObserver> receiver =
observer_remote.InitWithNewPipeAndPassReceiver();
- mojom::RenderFrameMetadataObserverClientPtrInfo client_info;
- mojom::RenderFrameMetadataObserverClientRequest client_request =
- mojo::MakeRequest(&client_info);
+ mojo::PendingRemote<mojom::RenderFrameMetadataObserverClient> client_remote;
client_ = std::make_unique<
testing::NiceMock<MockRenderFrameMetadataObserverClient>>(
- std::move(client_request), std::move(observer_remote));
+ client_remote.InitWithNewPipeAndPassReceiver(),
+ std::move(observer_remote));
observer_impl_ = std::make_unique<RenderFrameMetadataObserverImpl>(
- std::move(receiver), std::move(client_info));
+ std::move(receiver), std::move(client_remote));
observer_impl_->BindToCurrentThread();
}
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index e5fdbd3..49f3e19 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1847,8 +1847,8 @@
scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue,
const GURL& url,
LayerTreeFrameSinkCallback callback,
- mojom::RenderFrameMetadataObserverClientRequest
- render_frame_metadata_observer_client_request,
+ mojo::PendingReceiver<mojom::RenderFrameMetadataObserverClient>
+ render_frame_metadata_observer_client_receiver,
mojo::PendingRemote<mojom::RenderFrameMetadataObserver>
render_frame_metadata_observer_remote,
const char* client_name) {
@@ -1902,7 +1902,7 @@
std::move(compositor_frame_sink_client));
frame_sink_provider_->RegisterRenderFrameMetadataObserver(
widget_routing_id,
- std::move(render_frame_metadata_observer_client_request),
+ std::move(render_frame_metadata_observer_client_receiver),
std::move(render_frame_metadata_observer_remote));
std::move(callback).Run(
std::make_unique<cc::mojo_embedder::AsyncLayerTreeFrameSink>(
@@ -1965,7 +1965,7 @@
// TODO(ericrk): Collapse with non-webview registration below.
frame_sink_provider_->RegisterRenderFrameMetadataObserver(
widget_routing_id,
- std::move(render_frame_metadata_observer_client_request),
+ std::move(render_frame_metadata_observer_client_receiver),
std::move(render_frame_metadata_observer_remote));
std::move(callback).Run(std::make_unique<SynchronousLayerTreeFrameSink>(
@@ -1988,7 +1988,7 @@
std::move(compositor_frame_sink_client));
frame_sink_provider_->RegisterRenderFrameMetadataObserver(
widget_routing_id,
- std::move(render_frame_metadata_observer_client_request),
+ std::move(render_frame_metadata_observer_client_receiver),
std::move(render_frame_metadata_observer_remote));
params.gpu_memory_buffer_manager = GetGpuMemoryBufferManager();
std::move(callback).Run(
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 54e3c5a..b1bc912 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -47,6 +47,7 @@
#include "mojo/public/cpp/bindings/associated_receiver.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "mojo/public/cpp/bindings/thread_safe_interface_ptr.h"
@@ -238,8 +239,8 @@
scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue,
const GURL& url,
LayerTreeFrameSinkCallback callback,
- mojom::RenderFrameMetadataObserverClientRequest
- render_frame_metadata_observer_client_request,
+ mojo::PendingReceiver<mojom::RenderFrameMetadataObserverClient>
+ render_frame_metadata_observer_client_receiver,
mojo::PendingRemote<mojom::RenderFrameMetadataObserver>
render_frame_metadata_observer_remote,
const char* client_name) override;
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 8e6a8c9..074a065 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1177,13 +1177,13 @@
// TODO(jonross): have this generated by the LayerTreeFrameSink itself, which
// would then handle binding.
mojo::PendingRemote<mojom::RenderFrameMetadataObserver> observer_remote;
- mojom::RenderFrameMetadataObserverClientPtrInfo client_info;
- mojom::RenderFrameMetadataObserverClientRequest client_request =
- mojo::MakeRequest(&client_info);
+ mojo::PendingRemote<mojom::RenderFrameMetadataObserverClient> client_remote;
+ mojo::PendingReceiver<mojom::RenderFrameMetadataObserverClient>
+ client_receiver = client_remote.InitWithNewPipeAndPassReceiver();
auto render_frame_metadata_observer =
std::make_unique<RenderFrameMetadataObserverImpl>(
observer_remote.InitWithNewPipeAndPassReceiver(),
- std::move(client_info));
+ std::move(client_remote));
layer_tree_view_->SetRenderFrameObserver(
std::move(render_frame_metadata_observer));
GURL url = GetWebWidget()->GetURLForDebugTrace();
@@ -1199,7 +1199,7 @@
const char* client_name = for_child_local_root_frame_ ? kOOPIF : kRenderer;
compositor_deps_->RequestNewLayerTreeFrameSink(
routing_id_, frame_swap_message_queue_, std::move(url),
- std::move(callback), std::move(client_request),
+ std::move(callback), std::move(client_receiver),
std::move(observer_remote), client_name);
}
diff --git a/content/test/fake_compositor_dependencies.cc b/content/test/fake_compositor_dependencies.cc
index 9791847..0d26bd0 100644
--- a/content/test/fake_compositor_dependencies.cc
+++ b/content/test/fake_compositor_dependencies.cc
@@ -87,8 +87,8 @@
scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue,
const GURL& url,
LayerTreeFrameSinkCallback callback,
- mojom::RenderFrameMetadataObserverClientRequest
- render_frame_metadata_observer_client_request,
+ mojo::PendingReceiver<mojom::RenderFrameMetadataObserverClient>
+ render_frame_metadata_observer_client_receiver,
mojo::PendingRemote<mojom::RenderFrameMetadataObserver>
render_frame_metadata_observer_remote,
const char* client_name) {
diff --git a/content/test/fake_compositor_dependencies.h b/content/test/fake_compositor_dependencies.h
index 2305748e..b13f5c0 100644
--- a/content/test/fake_compositor_dependencies.h
+++ b/content/test/fake_compositor_dependencies.h
@@ -9,6 +9,7 @@
#include "base/single_thread_task_runner.h"
#include "cc/test/test_task_graph_runner.h"
#include "content/renderer/compositor/compositor_dependencies.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "third_party/blink/public/platform/scheduler/test/web_fake_thread_scheduler.h"
@@ -41,8 +42,8 @@
scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue,
const GURL& url,
LayerTreeFrameSinkCallback callback,
- mojom::RenderFrameMetadataObserverClientRequest
- render_frame_metadata_observer_client_request,
+ mojo::PendingReceiver<mojom::RenderFrameMetadataObserverClient>
+ render_frame_metadata_observer_client_receiver,
mojo::PendingRemote<mojom::RenderFrameMetadataObserver>
render_frame_metadata_observer_remote,
const char* client_name) override;
