Index: mojo/common/tracing_impl.cc |
diff --git a/mojo/common/tracing_impl.cc b/mojo/common/tracing_impl.cc |
index a11c6cc349cff1eac5e48284d68e3d2869c5b452..ae3077948c8f0dde4c8abe35e6a5ead3985d55e3 100644 |
--- a/mojo/common/tracing_impl.cc |
+++ b/mojo/common/tracing_impl.cc |
@@ -6,9 +6,12 @@ |
#include "base/trace_event/trace_event_impl.h" |
#include "mojo/public/cpp/application/application_impl.h" |
+#include "mojo/public/cpp/application/connect.h" |
#include "mojo/public/cpp/bindings/interface_handle.h" |
#include "mojo/public/cpp/bindings/interface_request.h" |
#include "mojo/public/interfaces/application/service_provider.mojom.h" |
+#include "mojo/services/tracing/interfaces/trace_provider_registry.mojom.h" |
+#include "mojo/services/tracing/interfaces/tracing.mojom.h" |
namespace mojo { |
@@ -17,13 +20,12 @@ TracingImpl::TracingImpl() {} |
TracingImpl::~TracingImpl() {} |
void TracingImpl::Initialize(ApplicationImpl* app) { |
- InterfaceHandle<ServiceProvider> outgoing_sp_handle; |
- InterfaceRequest<ServiceProvider> outgoing_sp_request = |
- GetProxy(&outgoing_sp_handle); |
- app->shell()->ConnectToApplication("mojo:tracing", nullptr, |
- outgoing_sp_handle.Pass()); |
- outgoing_sp_for_tracing_service_.Bind(outgoing_sp_request.Pass()); |
- outgoing_sp_for_tracing_service_.AddService(this); |
+ tracing::TraceProviderRegistryPtr registry; |
+ ConnectToService(app->shell(), "mojo:tracing", GetProxy(®istry)); |
+ |
+ mojo::InterfaceHandle<tracing::TraceProvider> provider; |
+ provider_impl_.Bind(GetProxy(&provider)); |
+ registry->RegisterTraceProvider(provider.Pass()); |
#ifdef NDEBUG |
if (app->HasArg("--early-tracing")) { |
@@ -34,9 +36,4 @@ void TracingImpl::Initialize(ApplicationImpl* app) { |
#endif |
} |
-void TracingImpl::Create(ApplicationConnection* connection, |
- InterfaceRequest<tracing::TraceProvider> request) { |
- provider_impl_.Bind(request.Pass()); |
-} |
- |
} // namespace mojo |