commit b14cd33ee8b2780adbcbf721a73caca6ba7b5044
author Viet-Trung Luu <viettrungluu@chromium.org> Tue May 03 10:29:36 2016 -0700
committer Viet-Trung Luu <viettrungluu@chromium.org> Tue May 03 10:29:36 2016 -0700
tree cc68ea914c55406e4ca929fa5fc8db40540c0a92
parent 2f2d1bece6eb2dae607edadbc7355cec65e892fb

Use TraceProviderRegistry in //shell/context.cc.

R=vardhan@google.com
BUG=#763

Review URL: https://codereview.chromium.org/1940973002 .

shell/context.cc

diff --git a/shell/context.cc b/shell/context.cc
index 8052e1b..55aadb4 100644
--- a/shell/context.cc
+++ b/shell/context.cc
@@ -29,7 +29,8 @@
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/application/connect.h"
+#include "mojo/services/tracing/interfaces/trace_provider_registry.mojom.h"
 #include "mojo/services/tracing/interfaces/tracing.mojom.h"
 #include "shell/application_manager/application_loader.h"
 #include "shell/application_manager/application_manager.h"
@@ -193,28 +194,6 @@
       ->new_process_per_connection = true;
 }
 
-class TracingServiceProvider : public ServiceProvider {
- public:
-  TracingServiceProvider(Tracer* tracer,
-                         mojo::InterfaceRequest<ServiceProvider> request)
-      : tracer_(tracer), binding_(this, request.Pass()) {}
-  ~TracingServiceProvider() override {}
-
-  void ConnectToService(const mojo::String& service_name,
-                        mojo::ScopedMessagePipeHandle client_handle) override {
-    if (tracer_ && service_name == tracing::TraceProvider::Name_) {
-      tracer_->ConnectToProvider(
-          mojo::InterfaceRequest<tracing::TraceProvider>(client_handle.Pass()));
-    }
-  }
-
- private:
-  Tracer* tracer_;
-  mojo::StrongBinding<mojo::ServiceProvider> binding_;
-
-  DISALLOW_COPY_AND_ASSIGN(TracingServiceProvider);
-};
-
 }  // namespace
 
 Context::Context(Tracer* tracer)
@@ -330,18 +309,22 @@
     ApplyApplicationArgs(this, current->argv()[i]);
 
   ServiceProviderPtr tracing_services;
-  ServiceProviderPtr tracing_exposed_services;
-  new TracingServiceProvider(tracer_, GetProxy(&tracing_exposed_services));
-  application_manager_.ConnectToApplication(
-      GURL("mojo:tracing"), GURL(""), GetProxy(&tracing_services),
-      tracing_exposed_services.Pass(), base::Closure());
+  application_manager_.ConnectToApplication(GURL("mojo:tracing"), GURL(""),
+                                            GetProxy(&tracing_services),
+                                            nullptr, base::Closure());
+  if (tracer_) {
+    tracing::TraceProviderRegistryPtr registry;
+    mojo::ConnectToService(tracing_services.get(), GetProxy(&registry));
+
+    mojo::InterfaceHandle<tracing::TraceProvider> provider;
+    tracer_->ConnectToProvider(GetProxy(&provider));
+    registry->RegisterTraceProvider(provider.Pass());
+  }
 
   if (command_line.HasSwitch(switches::kTraceStartup)) {
     DCHECK(tracer_);
     tracing::TraceCollectorPtr coordinator;
-    auto coordinator_request = GetProxy(&coordinator);
-    tracing_services->ConnectToService(tracing::TraceCollector::Name_,
-                                       coordinator_request.PassMessagePipe());
+    mojo::ConnectToService(tracing_services.get(), GetProxy(&coordinator));
     tracer_->StartCollectingFromTracingService(coordinator.Pass());
   }