Reland again [Startup Tracing] Add --trace-config-file flag

mandoline/app/desktop/launcher_process.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 <stdio.h>
 #include <string.h>
 
 #include <algorithm>
 #include <iostream>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/trace_event/trace_event.h"
-#include "components/tracing/startup_tracing.h"
+#include "components/tracing/trace_config_file.h"
 #include "components/tracing/tracing_switches.h"
 #include "mandoline/app/core_services_initialization.h"
 #include "mandoline/app/desktop/launcher_process.h"
 #include "mojo/runner/context.h"
 #include "mojo/runner/switches.h"
 
 namespace mandoline {
 namespace {
 
 // Whether we're currently tracing.
@@ skipping 54 matching lines @@
 int LauncherProcessMain(int argc, char** argv) {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kTraceStartup)) {
     g_tracing = true;
     base::trace_event::TraceConfig trace_config(
         command_line.GetSwitchValueASCII(switches::kTraceStartup),
         base::trace_event::RECORD_UNTIL_FULL);
     base::trace_event::TraceLog::GetInstance()->SetEnabled(
         trace_config, base::trace_event::TraceLog::RECORDING_MODE);
-  } else {
-    // |g_tracing| is not touched in this case and Telemetry will stop tracing
-    // on demand later.
-    tracing::EnableStartupTracingIfConfigFileExists();
+  } else if (tracing::TraceConfigFile::GetInstance()->IsEnabled()) {
+    g_tracing = true;
+    base::trace_event::TraceLog::GetInstance()->SetEnabled(
+        tracing::TraceConfigFile::GetInstance()->GetTraceConfig(),
+        base::trace_event::TraceLog::RECORDING_MODE);
   }
 
   // We want the runner::Context to outlive the MessageLoop so that pipes are
   // all gracefully closed / error-out before we try to shut the Context down.
   mojo::runner::Context shell_context;
   InitCoreServicesForContext(&shell_context);
   {
     base::MessageLoop message_loop;
     if (!shell_context.Init()) {
       return 0;
@@ skipping 13 matching lines @@
     // Must be called before |message_loop| is destroyed.
     shell_context.Shutdown();
   }
 
   if (g_tracing)
     StopTracingAndFlushToDisk();
   return 0;
 }
 
 }  // namespace mandoline