De-client tracing.TraceController interface

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/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/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
+#include "mojo/common/trace_controller_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 "services/tracing/tracing.mojom.h"
 #include "shell/application_manager/application_loader.h"
 #include "shell/application_manager/application_manager.h"
 #include "shell/dynamic_application_loader.h"
@@ skipping 108 matching lines @@
       const GURL from(pair.first);
       const GURL to = context->ResolveCommandLineURL(pair.second);
       if (!from.is_valid() || !to.is_valid())
         return false;
       resolver->AddCustomMapping(from, to);
     }
   }
   return true;
 }
 
+class TracingServiceProvider : public ServiceProvider {
+ public:
+  explicit TracingServiceProvider(InterfaceRequest<ServiceProvider> request)
+      : binding_(this, request.Pass()) {}
+  ~TracingServiceProvider() override {}
+
+  void ConnectToService(const mojo::String& service_name,
+                        ScopedMessagePipeHandle client_handle) override {
+    if (service_name == tracing::TraceController::Name_) {
+      new TraceControllerImpl(
+          MakeRequest<tracing::TraceController>(client_handle.Pass()));
+    }
+  }
+
+ private:
+  StrongBinding<ServiceProvider> binding_;
+};

[viettrungluu, 2015/02/02 21:22:44]

DISALLOW_COPY_AND_ASSIGN

+
 }  // namespace
 
 Context::Context() : application_manager_(this) {
   DCHECK(!base::MessageLoop::current());
 
   // By default assume that the local apps reside alongside the shell.
   // TODO(ncbray): really, this should be passed in rather than defaulting.
   // This default makes sense for desktop but not Android.
   base::FilePath shell_dir;
   PathService::Get(base::DIR_MODULE, &shell_dir);
@@ skipping 63 matching lines @@
     runner_factory.reset(new OutOfProcessDynamicServiceRunnerFactory());
   else
     runner_factory.reset(new InProcessDynamicServiceRunnerFactory());
 
   DynamicApplicationLoader* dynamic_application_loader =
       new DynamicApplicationLoader(this, runner_factory.Pass());
   InitContentHandlers(dynamic_application_loader, command_line);
   application_manager_.set_default_loader(
       scoped_ptr<ApplicationLoader>(dynamic_application_loader));
 
-  tracing::TraceDataCollectorPtr trace_data_collector_ptr;
-  application_manager_.ConnectToService(GURL("mojo:tracing"),
-                                        &trace_data_collector_ptr);
-  TracingImpl::Create(trace_data_collector_ptr.Pass());
+  ServiceProviderPtr tracing_service_provider_ptr;
+  new TracingServiceProvider(GetProxy(&tracing_service_provider_ptr));
+  application_manager_.ConnectToApplication(
+      GURL("mojo:tracing"), GURL(""), nullptr,
+      tracing_service_provider_ptr.Pass());
 
   if (listener_)
     listener_->WaitForListening();
 
   return true;
 }
 
 void Context::OnApplicationError(const GURL& url) {
   if (app_urls_.find(url) != app_urls_.end()) {
     app_urls_.erase(url);
@@ skipping 22 matching lines @@
 ScopedMessagePipeHandle Context::ConnectToServiceByName(
     const GURL& application_url,
     const std::string& service_name) {
   app_urls_.insert(application_url);
   return application_manager_.ConnectToServiceByName(application_url,
                                                      service_name).Pass();
 }
 
 }  // namespace shell
 }  // namespace mojo