Make Tracing Service not use outgoing InterfaceProvider, update conventions

services/shell/standalone/tracer.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/shell/standalone/tracer.h"
 
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <utility>
@@ skipping 32 matching lines @@
         << "Could not parse --trace-startup-duration value "
         << duration_seconds_str;
   }
   base::MessageLoop::current()->task_runner()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&Tracer::StopAndFlushToFile, base::Unretained(this)),
       base::TimeDelta::FromSeconds(trace_duration_secs));
 }
 
 void Tracer::StartCollectingFromTracingService(
-    tracing::TraceCollectorPtr coordinator) {
+    tracing::mojom::CollectorPtr coordinator) {
   coordinator_ = std::move(coordinator);
   mojo::DataPipe data_pipe;
   coordinator_->Start(std::move(data_pipe.producer_handle), categories_);
   drainer_.reset(new mojo::common::DataPipeDrainer(
       this, std::move(data_pipe.consumer_handle)));
 }
 
 void Tracer::StopAndFlushToFile() {
   if (tracing_)
     StopTracingAndFlushToDisk();
 }
 
-void Tracer::ConnectToProvider(
-    mojo::InterfaceRequest<tracing::TraceProvider> request) {
-  trace_provider_impl_.Bind(std::move(request));
+void Tracer::ConnectToProvider(tracing::mojom::ProviderRequest request) {
+  provider_.Bind(std::move(request));
 }
 
 void Tracer::StopTracingAndFlushToDisk() {
   tracing_ = false;
   trace_file_ = fopen(trace_filename_.c_str(), "w+");
   PCHECK(trace_file_);
   static const char kStart[] = "{\"traceEvents\":[";
   PCHECK(fwrite(kStart, 1, strlen(kStart), trace_file_) == strlen(kStart));
 
   // At this point we might be connected to the tracing service, in which case
@@ skipping 77 matching lines @@
   WriteFooterAndClose();
 }
 
 void Tracer::WriteCommaIfNeeded() {
   if (first_chunk_written_)
     PCHECK(fwrite(",", 1, 1, trace_file_) == 1);
   first_chunk_written_ = true;
 }
 
 }  // namespace shell