Commit b06dc1b5 authored by Abhijeet Kandalkar's avatar Abhijeet Kandalkar Committed by Commit Bot

Convert perfetto_service.mojom to new Mojo types (5/n)

This CL converts usage of |ConsumerHostRequest| to
mojo::PendingReceiver<mojom::ConsumerHost>

Bug: 955171, 978694
Change-Id: I5ce130f32d6c1af7662e239e47046d8f2187250d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1843992Reviewed-by: default avatarOksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: default avataroysteine <oysteine@chromium.org>
Commit-Queue: Abhijeet Kandalkar <abhijeet@igalia.com>
Cr-Commit-Position: refs/heads/master@{#704515}
parent de6b0680
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "base/trace_event/trace_log.h" #include "base/trace_event/trace_log.h"
#include "base/values.h" #include "base/values.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "mojo/public/cpp/bindings/self_owned_receiver.h"
#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/cpp/system/wait.h" #include "mojo/public/cpp/system/wait.h"
#include "services/tracing/perfetto/json_trace_exporter.h" #include "services/tracing/perfetto/json_trace_exporter.h"
...@@ -479,12 +480,12 @@ void ConsumerHost::TracingSession::Flush( ...@@ -479,12 +480,12 @@ void ConsumerHost::TracingSession::Flush(
} }
// static // static
void ConsumerHost::BindConsumerRequest( void ConsumerHost::BindConsumerReceiver(
PerfettoService* service, PerfettoService* service,
mojom::ConsumerHostRequest request, mojo::PendingReceiver<mojom::ConsumerHost> receiver,
const service_manager::BindSourceInfo& source_info) { const service_manager::BindSourceInfo& source_info) {
mojo::MakeStrongBinding(std::make_unique<ConsumerHost>(service), mojo::MakeSelfOwnedReceiver(std::make_unique<ConsumerHost>(service),
std::move(request)); std::move(receiver));
} }
ConsumerHost::ConsumerHost(PerfettoService* service) : service_(service) { ConsumerHost::ConsumerHost(PerfettoService* service) : service_(service) {
......
...@@ -40,9 +40,9 @@ class PerfettoService; ...@@ -40,9 +40,9 @@ class PerfettoService;
// to act as a Perfetto consumer. // to act as a Perfetto consumer.
class ConsumerHost : public perfetto::Consumer, public mojom::ConsumerHost { class ConsumerHost : public perfetto::Consumer, public mojom::ConsumerHost {
public: public:
static void BindConsumerRequest( static void BindConsumerReceiver(
PerfettoService* service, PerfettoService* service,
mojom::ConsumerHostRequest request, mojo::PendingReceiver<mojom::ConsumerHost> receiver,
const service_manager::BindSourceInfo& source_info); const service_manager::BindSourceInfo& source_info);
class StreamWriter; class StreamWriter;
......
...@@ -189,7 +189,7 @@ void TracingService::OnStart() { ...@@ -189,7 +189,7 @@ void TracingService::OnStart() {
base::Unretained(tracing_coordinator_.get()))); base::Unretained(tracing_coordinator_.get())));
registry_.AddInterface( registry_.AddInterface(
base::BindRepeating(&ConsumerHost::BindConsumerRequest, base::BindRepeating(&ConsumerHost::BindConsumerReceiver,
base::Unretained(PerfettoService::GetInstance()))); base::Unretained(PerfettoService::GetInstance())));
service_listener_ = std::make_unique<ServiceListener>( service_listener_ = std::make_unique<ServiceListener>(
......
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