Make tracing work in service manager

services/tracing/public/cpp/provider.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/tracing/public/cpp/provider.h"
 
 #include <utility>
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
@@ skipping 24 matching lines @@
 
 }
 
 Provider::Provider()
     : binding_(this), tracing_forced_(false), weak_factory_(this) {}
 
 Provider::~Provider() {
   StopTracing();
 }
 
+void Provider::InitializeWithFactoryInternal(mojom::FactoryPtr* factory) {
+  mojom::ProviderPtr provider;
+  Bind(GetProxy(&provider));
+  (*factory)->CreateRecorder(std::move(provider));
+#ifdef NDEBUG
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          tracing::kEarlyTracing)) {
+    ForceEnableTracing();
+  }
+#else
+  ForceEnableTracing();
+#endif
+}
+
+void Provider::InitializeWithFactory(mojom::FactoryPtr* factory) {
+  {
+    base::AutoLock lock(g_singleton_lock.Get());
+    if (g_tracing_singleton_created)
+      return;
+    g_tracing_singleton_created = true;
+  }
+  InitializeWithFactoryInternal(factory);
+}
+
 void Provider::Initialize(service_manager::Connector* connector,
                           const std::string& url) {
   {
     base::AutoLock lock(g_singleton_lock.Get());
     if (g_tracing_singleton_created)
       return;
     g_tracing_singleton_created = true;
   }
-
+  mojom::FactoryPtr factory;
+  connector->ConnectToInterface("service:tracing", &factory);
+  InitializeWithFactoryInternal(&factory);
   // This will only set the name for the first app in a loaded mojo file. It's
   // up to something like CoreServices to name its own child threads.
   base::PlatformThread::SetName(url);
-
-  mojom::FactoryPtr factory;
-  connector->ConnectToInterface("service:tracing", &factory);
-  mojom::ProviderPtr provider;
-  Bind(GetProxy(&provider));
-  factory->CreateRecorder(std::move(provider));
-#ifdef NDEBUG
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          tracing::kEarlyTracing)) {
-    ForceEnableTracing();
-  }
-#else
-  ForceEnableTracing();
-#endif
 }
 
 void Provider::Bind(mojom::ProviderRequest request) {
   if (!binding_.is_bound()) {
     binding_.Bind(std::move(request));
   } else {
     LOG(ERROR) << "Cannot accept two connections to TraceProvider.";
   }
 }
 
@@ skipping 57 matching lines @@
   // events. Empty string is not a valid chunk to record so skip in this case.
   if (!events_str->data().empty()) {
     recorder_->Record(mojo::String(events_str->data()));
   }
   if (!has_more_events) {
     recorder_.reset();
   }
 }
 
 }  // namespace tracing