Make tracing work in service manager

services/service_manager/standalone/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 "services/service_manager/standalone/context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 18 matching lines @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "components/tracing/common/tracing_switches.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/catalog/catalog.h"
 #include "services/catalog/store.h"
 #include "services/service_manager/connect_params.h"
+#include "services/service_manager/connect_util.h"
 #include "services/service_manager/public/cpp/names.h"
 #include "services/service_manager/runner/common/switches.h"
 #include "services/service_manager/runner/host/in_process_native_runner.h"
 #include "services/service_manager/runner/host/out_of_process_native_runner.h"
 #include "services/service_manager/standalone/tracer.h"
 #include "services/service_manager/switches.h"
 #include "services/tracing/public/cpp/provider.h"
 #include "services/tracing/public/cpp/switches.h"
 #include "services/tracing/public/interfaces/tracing.mojom.h"
 
@@ skipping 17 matching lines @@
 class Setup {
  public:
   Setup() { mojo::edk::Init(); }
 
   ~Setup() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Setup);
 };
 
-class TracingInterfaceProvider : public mojom::InterfaceProvider {
- public:
-  explicit TracingInterfaceProvider(Tracer* tracer) : tracer_(tracer) {}
-  ~TracingInterfaceProvider() override {}
-
-  // mojom::InterfaceProvider:
-  void GetInterface(const std::string& interface_name,
-                    mojo::ScopedMessagePipeHandle client_handle) override {
-    if (tracer_ && interface_name == tracing::mojom::Provider::Name_) {
-      tracer_->ConnectToProvider(
-          mojo::MakeRequest<tracing::mojom::Provider>(
-              std::move(client_handle)));
-    }
-  }
-
- private:
-  Tracer* tracer_;
-
-  DISALLOW_COPY_AND_ASSIGN(TracingInterfaceProvider);
-};
-
 const size_t kMaxBlockingPoolThreads = 3;
 
 std::unique_ptr<base::Thread> CreateIOThread(const char* name) {
   std::unique_ptr<base::Thread> thread(new base::Thread(name));
   base::Thread::Options options;
   options.message_loop_type = base::MessageLoop::TYPE_IO;
   thread->StartWithOptions(options);
   return thread;
 }
 
@@ skipping 88 matching lines @@
       std::unique_ptr<ServiceOverrides> service_overrides =
           base::MakeUnique<ServiceOverrides>(std::move(contents));
       for (const auto& iter : service_overrides->entries()) {
         if (!iter.second.package_name.empty())
           catalog_->OverridePackageName(iter.first, iter.second.package_name);
       }
       service_manager_->SetServiceOverrides(std::move(service_overrides));
     }
   }
 
-  mojom::InterfaceProviderPtr tracing_remote_interfaces;
-  mojom::InterfaceProviderPtr tracing_local_interfaces;
-  mojo::MakeStrongBinding(base::MakeUnique<TracingInterfaceProvider>(&tracer_),
-                          mojo::GetProxy(&tracing_local_interfaces));
 
-  std::unique_ptr<ConnectParams> params(new ConnectParams);
-  params->set_source(CreateServiceManagerIdentity());
-  params->set_target(Identity("service:tracing", mojom::kRootUserID));
-  params->set_remote_interfaces(mojo::GetProxy(&tracing_remote_interfaces));
-  service_manager_->Connect(std::move(params));
+  Identity source_identity = CreateServiceManagerIdentity();
+  Identity tracing_identity("service:tracing", mojom::kRootUserID);
+  tracing::mojom::FactoryPtr factory;
+  ConnectToInterface(service_manager(), source_identity, tracing_identity,
+                     &factory);
+  provider_.InitializeWithFactory(&factory);
 
   if (command_line.HasSwitch(tracing::kTraceStartup)) {
     tracing::mojom::CollectorPtr coordinator;
-    auto coordinator_request = GetProxy(&coordinator);
-    tracing_remote_interfaces->GetInterface(
-        tracing::mojom::Collector::Name_,
-        coordinator_request.PassMessagePipe());
+    ConnectToInterface(service_manager(), source_identity, tracing_identity,
+                       &coordinator);
     tracer_.StartCollectingFromTracingService(std::move(coordinator));
   }
 
   // Record the service manager startup metrics used for performance testing.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           tracing::kEnableStatsCollectionBindings)) {
     tracing::mojom::StartupPerformanceDataCollectorPtr collector;
-    tracing_remote_interfaces->GetInterface(
-        tracing::mojom::StartupPerformanceDataCollector::Name_,
-        mojo::GetProxy(&collector).PassMessagePipe());
+    ConnectToInterface(service_manager(), source_identity, tracing_identity,
+                       &collector);
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
     // CurrentProcessInfo::CreationTime is only defined on some platforms.
     const base::Time creation_time = base::CurrentProcessInfo::CreationTime();
     collector->SetServiceManagerProcessCreationTime(
         creation_time.ToInternalValue());
 #endif
     collector->SetServiceManagerMainEntryPointTime(
         main_entry_time_.ToInternalValue());
   }
 }
@@ skipping 47 matching lines @@
   mojom::InterfaceProviderPtr local_interfaces;
 
   std::unique_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateServiceManagerIdentity());
   params->set_target(Identity(name, mojom::kRootUserID));
   params->set_remote_interfaces(mojo::GetProxy(&remote_interfaces));
   service_manager_->Connect(std::move(params));
 }
 
 }  // namespace service_manager