Make Tracing Service not use outgoing InterfaceProvider, update conventions

services/shell/standalone/tracer.h

Index: services/shell/standalone/tracer.h
diff --git a/services/shell/standalone/tracer.h b/services/shell/standalone/tracer.h
index 173f3ab2ddbf966ea746243261a6b600384d24e4..d330779553d7d74a2aba0441a176dd5993efd30e 100644
--- a/services/shell/standalone/tracer.h
+++ b/services/shell/standalone/tracer.h
@@ -15,7 +15,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
 #include "mojo/common/data_pipe_drainer.h"
-#include "services/tracing/public/cpp/trace_provider_impl.h"
+#include "services/tracing/public/cpp/provider.h"
 #include "services/tracing/public/interfaces/tracing.mojom.h"
 
 namespace shell {
@@ -41,15 +41,14 @@ class Tracer : public mojo::common::DataPipeDrainer::Client {
   // Starts collecting data from the tracing service with the given set of
   // categories.
   void StartCollectingFromTracingService(
-      tracing::TraceCollectorPtr coordinator);
+      tracing::mojom::CollectorPtr coordinator);
 
   // Stops tracing and flushes all collected trace data to the file specified in
   // Start(). Blocks until the file write is complete. May be called after the
   // message loop is shut down.
   void StopAndFlushToFile();
 
-  void ConnectToProvider(
-      mojo::InterfaceRequest<tracing::TraceProvider> request);
+  void ConnectToProvider(tracing::mojom::ProviderRequest request);
 
  private:
   void StopTracingAndFlushToDisk();
@@ -76,10 +75,10 @@ class Tracer : public mojo::common::DataPipeDrainer::Client {
   void WriteFooterAndClose();
 
   // Set when connected to the tracing service.
-  tracing::TraceCollectorPtr coordinator_;
+  tracing::mojom::CollectorPtr coordinator_;
   std::unique_ptr<mojo::common::DataPipeDrainer> drainer_;
 
-  mojo::TraceProviderImpl trace_provider_impl_;
+  tracing::Provider provider_;
   // Whether we're currently tracing.
   bool tracing_;
   // Categories to trace.