Index: services/tracing/service.h |
diff --git a/services/tracing/service.h b/services/tracing/service.h |
index f9fc30ef8e04b222c33e90282967b2587b5bc572..022214b36afd23d01fbe2d3995b2394d2ae4f8bf 100644 |
--- a/services/tracing/service.h |
+++ b/services/tracing/service.h |
@@ -22,36 +22,35 @@ |
namespace tracing { |
-class Service |
- : public shell::Service, |
- public shell::InterfaceFactory<mojom::Factory>, |
- public shell::InterfaceFactory<mojom::Collector>, |
- public shell::InterfaceFactory<mojom::StartupPerformanceDataCollector>, |
- public mojom::Factory, |
- public mojom::Collector, |
- public mojom::StartupPerformanceDataCollector { |
+class Service : public service_manager::Service, |
+ public service_manager::InterfaceFactory<mojom::Factory>, |
+ public service_manager::InterfaceFactory<mojom::Collector>, |
+ public service_manager::InterfaceFactory< |
+ mojom::StartupPerformanceDataCollector>, |
+ public mojom::Factory, |
+ public mojom::Collector, |
+ public mojom::StartupPerformanceDataCollector { |
public: |
Service(); |
~Service() override; |
private: |
- // shell::Service implementation. |
- bool OnConnect(const shell::Identity& remote_identity, |
- shell::InterfaceRegistry* registry) override; |
+ // service_manager::Service implementation. |
+ bool OnConnect(const service_manager::Identity& remote_identity, |
+ service_manager::InterfaceRegistry* registry) override; |
bool OnStop() override; |
- // shell::InterfaceFactory<mojom::Factory>: |
- void Create(const shell::Identity& remote_identity, |
+ // service_manager::InterfaceFactory<mojom::Factory>: |
+ void Create(const service_manager::Identity& remote_identity, |
mojom::FactoryRequest request) override; |
- // shell::InterfaceFactory<mojom::Collector>: |
- void Create(const shell::Identity& remote_identity, |
+ // service_manager::InterfaceFactory<mojom::Collector>: |
+ void Create(const service_manager::Identity& remote_identity, |
mojom::CollectorRequest request) override; |
- // shell::InterfaceFactory<mojom::StartupPerformanceDataCollector>: |
- void Create( |
- const shell::Identity& remote_identity, |
- mojom::StartupPerformanceDataCollectorRequest request) override; |
+ // service_manager::InterfaceFactory<mojom::StartupPerformanceDataCollector>: |
+ void Create(const service_manager::Identity& remote_identity, |
+ mojom::StartupPerformanceDataCollectorRequest request) override; |
// mojom::Factory: |
void CreateRecorder(mojom::ProviderPtr provider) override; |