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

mojo/runner/desktop/launcher_process.cc

Index: mojo/runner/desktop/launcher_process.cc
diff --git a/mojo/runner/desktop/launcher_process.cc b/mojo/runner/desktop/launcher_process.cc
index 946f61ff6a4318379f8bd63f226eb0bcb5cac3a1..88f20a4453d2df86c17e93c90d13d8d413f392c2 100644
--- a/mojo/runner/desktop/launcher_process.cc
+++ b/mojo/runner/desktop/launcher_process.cc
@@ -15,7 +15,7 @@
 #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 "mojo/runner/context.h"
 #include "mojo/runner/switches.h"
@@ -90,9 +90,12 @@ int LauncherProcessMain(int argc, char** argv) {
     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();
+    g_tracing = true;

[msw, 2015/08/25 18:06:49]

Ditto from mandoline.

[Zhen Wang, 2015/08/25 18:18:37]

fixed

+    if (tracing::TraceConfigFile::GetInstance()->IsEnabled()) {
+      base::trace_event::TraceLog::GetInstance()->SetEnabled(
+          tracing::TraceConfigFile::GetInstance()->GetTraceConfig(),
+          base::trace_event::TraceLog::RECORDING_MODE);
+    }
   }
 
   // We want the shell::Context to outlive the MessageLoop so that pipes are