commit 6a1a4d5c1d686f799968ce76a5f170b6c7e0322f
author Florian Mayer <fmayer@google.com> Fri Jun 08 16:47:07 2018 +0100
committer Primiano Tucci <primiano@google.com> Tue Jun 19 09:26:39 2018 +0000
tree 1f85a5e392f40da9f303331b314df4d6db9b510a
parent 4ce4cb826374b59ba774a5b7387c046d1ca8f218

Rename Service to TracingService.

Bug: 74331089
Change-Id: Icdfa59d23ed661f0f103733488513d7a4e817b23

src/tracing/ipc/service/consumer_ipc_service.h

diff --git a/src/tracing/ipc/service/consumer_ipc_service.h b/src/tracing/ipc/service/consumer_ipc_service.h
index d2b22ce..3fdc5d6 100644
--- a/src/tracing/ipc/service/consumer_ipc_service.h
+++ b/src/tracing/ipc/service/consumer_ipc_service.h
@@ -25,7 +25,7 @@
 #include "perfetto/base/weak_ptr.h"
 #include "perfetto/ipc/basic_types.h"
 #include "perfetto/tracing/core/consumer.h"
-#include "perfetto/tracing/core/service.h"
+#include "perfetto/tracing/core/tracing_service.h"
 
 #include "perfetto/ipc/consumer_port.ipc.h"
 
@@ -40,8 +40,7 @@
 // on the IPC socket, through the methods overriddden from ConsumerPort.
 class ConsumerIPCService : public protos::ConsumerPort {
  public:
-  using Service = ::perfetto::Service;  // To avoid collisions w/ ipc::Service.
-  explicit ConsumerIPCService(Service* core_service);
+  explicit ConsumerIPCService(TracingService* core_service);
   ~ConsumerIPCService() override;
 
   // ConsumerPort implementation (from .proto IPC definition).
@@ -73,9 +72,9 @@
     void OnTraceData(std::vector<TracePacket>, bool has_more) override;
 
     // The interface obtained from the core service business logic through
-    // Service::ConnectConsumer(this). This allows to invoke methods for a
-    // specific Consumer on the Service business logic.
-    std::unique_ptr<Service::ConsumerEndpoint> service_endpoint;
+    // TracingService::ConnectConsumer(this). This allows to invoke methods for
+    // a specific Consumer on the Service business logic.
+    std::unique_ptr<TracingService::ConsumerEndpoint> service_endpoint;
 
     // After DisableTracing() is invoked, this binds the async callback that
     // allows to stream trace packets back to the client.
@@ -98,7 +97,7 @@
 
   void OnFlushCallback(bool success, PendingFlushResponses::iterator);
 
-  Service* const core_service_;
+  TracingService* const core_service_;
 
   // Maps IPC clients to ConsumerEndpoint instances registered on the
   // |core_service_| business logic.