Commit 74381e33 authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

Convert RapporRecorder to new Mojo types

This CL converts RapporRecorderPtr and
RapporRecorderRequest to new Mojo types.

It uses Remote or PendingRemote and
PendingReceiver instead of RapporRecorderPtr
and RapporRecorderRequest.

Bug: 955171
Change-Id: I6658a0b3087af0646e6b7654fd4db0987a4e3cb6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1810446Reviewed-by: default avatarOksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Reviewed-by: default avatarAlexei Svitkine <asvitkine@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#698750}
parent ffacd6b1
...@@ -1465,14 +1465,16 @@ ChromeContentRendererClient::CreateBrowserPluginDelegate( ...@@ -1465,14 +1465,16 @@ ChromeContentRendererClient::CreateBrowserPluginDelegate(
void ChromeContentRendererClient::RecordRappor(const std::string& metric, void ChromeContentRendererClient::RecordRappor(const std::string& metric,
const std::string& sample) { const std::string& sample) {
if (!rappor_recorder_) if (!rappor_recorder_)
RenderThread::Get()->BindHostReceiver(mojo::MakeRequest(&rappor_recorder_)); RenderThread::Get()->BindHostReceiver(
rappor_recorder_.BindNewPipeAndPassReceiver());
rappor_recorder_->RecordRappor(metric, sample); rappor_recorder_->RecordRappor(metric, sample);
} }
void ChromeContentRendererClient::RecordRapporURL(const std::string& metric, void ChromeContentRendererClient::RecordRapporURL(const std::string& metric,
const GURL& url) { const GURL& url) {
if (!rappor_recorder_) if (!rappor_recorder_)
RenderThread::Get()->BindHostReceiver(mojo::MakeRequest(&rappor_recorder_)); RenderThread::Get()->BindHostReceiver(
rappor_recorder_.BindNewPipeAndPassReceiver());
rappor_recorder_->RecordRapporURL(metric, url); rappor_recorder_->RecordRapporURL(metric, url);
} }
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_channel_proxy.h"
#include "media/media_buildflags.h" #include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/generic_pending_receiver.h" #include "mojo/public/cpp/bindings/generic_pending_receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "ppapi/buildflags/buildflags.h" #include "ppapi/buildflags/buildflags.h"
#include "printing/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h"
#include "services/service_manager/public/cpp/binder_registry.h" #include "services/service_manager/public/cpp/binder_registry.h"
...@@ -271,7 +272,7 @@ class ChromeContentRendererClient ...@@ -271,7 +272,7 @@ class ChromeContentRendererClient
// Used to profile main thread. // Used to profile main thread.
std::unique_ptr<ThreadProfiler> main_thread_profiler_; std::unique_ptr<ThreadProfiler> main_thread_profiler_;
rappor::mojom::RapporRecorderPtr rappor_recorder_; mojo::Remote<rappor::mojom::RapporRecorder> rappor_recorder_;
std::unique_ptr<ChromeRenderThreadObserver> chrome_observer_; std::unique_ptr<ChromeRenderThreadObserver> chrome_observer_;
std::unique_ptr<web_cache::WebCacheImpl> web_cache_impl_; std::unique_ptr<web_cache::WebCacheImpl> web_cache_impl_;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "components/rappor/public/rappor_utils.h" #include "components/rappor/public/rappor_utils.h"
#include "components/rappor/rappor_service_impl.h" #include "components/rappor/rappor_service_impl.h"
#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h"
namespace rappor { namespace rappor {
...@@ -20,9 +20,10 @@ RapporRecorderImpl::~RapporRecorderImpl() = default; ...@@ -20,9 +20,10 @@ RapporRecorderImpl::~RapporRecorderImpl() = default;
// static // static
void RapporRecorderImpl::Create( void RapporRecorderImpl::Create(
RapporServiceImpl* rappor_service, RapporServiceImpl* rappor_service,
mojom::RapporRecorderRequest request) { mojo::PendingReceiver<mojom::RapporRecorder> receiver) {
mojo::MakeStrongBinding(std::make_unique<RapporRecorderImpl>(rappor_service), mojo::MakeSelfOwnedReceiver(
std::move(request)); std::make_unique<RapporRecorderImpl>(rappor_service),
std::move(receiver));
} }
void RapporRecorderImpl::RecordRappor(const std::string& metric, void RapporRecorderImpl::RecordRappor(const std::string& metric,
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "base/threading/thread_checker.h" #include "base/threading/thread_checker.h"
#include "components/rappor/public/mojom/rappor_recorder.mojom.h" #include "components/rappor/public/mojom/rappor_recorder.mojom.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
class GURL; class GURL;
...@@ -22,7 +23,7 @@ class RapporRecorderImpl : public mojom::RapporRecorder { ...@@ -22,7 +23,7 @@ class RapporRecorderImpl : public mojom::RapporRecorder {
~RapporRecorderImpl() override; ~RapporRecorderImpl() override;
static void Create(RapporServiceImpl* rappor_service, static void Create(RapporServiceImpl* rappor_service,
mojom::RapporRecorderRequest request); mojo::PendingReceiver<mojom::RapporRecorder> receiver);
private: private:
// rappor::mojom::RapporRecorder: // rappor::mojom::RapporRecorder:
......
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