Rename tracing interfaces.

shell/context.cc

 // Copyright 2013 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 "shell/context.h"
 
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
-#include "mojo/common/trace_controller_impl.h"
+#include "mojo/common/trace_provider_impl.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #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/services/tracing/public/interfaces/tracing.mojom.h"
 #include "shell/application_manager/application_loader.h"
 #include "shell/application_manager/application_manager.h"
 #include "shell/background_application_loader.h"
@@ skipping 151 matching lines @@
 
 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::TraceController::Name_) {
-      tracer_->ConnectToController(
-          mojo::MakeRequest<tracing::TraceController>(client_handle.Pass()));
+    if (tracer_ && service_name == tracing::TraceProvider::Name_) {
+      tracer_->ConnectToProvider(
+          mojo::MakeRequest<tracing::TraceProvider>(client_handle.Pass()));
     }
   }
 
  private:
   Tracer* tracer_;
   mojo::StrongBinding<mojo::ServiceProvider> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(TracingServiceProvider);
 };
 
@@ skipping 96 matching lines @@
 
   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());
 
   if (command_line.HasSwitch(switches::kTraceStartup)) {
     DCHECK(tracer_);
-    tracing::TraceCoordinatorPtr coordinator;
+    tracing::TraceCollectorPtr coordinator;
     auto coordinator_request = GetProxy(&coordinator);
-    tracing_services->ConnectToService(tracing::TraceCoordinator::Name_,
+    tracing_services->ConnectToService(tracing::TraceCollector::Name_,
                                        coordinator_request.PassMessagePipe());
     tracer_->StartCollectingFromTracingService(coordinator.Pass());
   }
 
   return true;
 }
 
 void Context::Shutdown() {
   TRACE_EVENT0("mojo_shell", "Context::Shutdown");
   DCHECK_EQ(base::MessageLoop::current()->task_runner(),
@@ skipping 36 matching lines @@
     app_urls_.erase(url);
     if (app_urls_.empty() && base::MessageLoop::current()->is_running()) {
       DCHECK_EQ(base::MessageLoop::current()->task_runner(),
                 task_runners_->shell_runner());
       base::MessageLoop::current()->Quit();
     }
   }
 }
 
 }  // namespace shell