Index: mojo/runner/desktop/launcher_process.cc |
diff --git a/mojo/runner/desktop/launcher_process.cc b/mojo/runner/desktop/launcher_process.cc |
index c2ed3c3d9a221a94bc8e4924d9b4ba3d9761f05c..946f61ff6a4318379f8bd63f226eb0bcb5cac3a1 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/trace_config_file.h" |
+#include "components/tracing/startup_tracing.h" |
#include "components/tracing/tracing_switches.h" |
#include "mojo/runner/context.h" |
#include "mojo/runner/switches.h" |
@@ -89,11 +89,10 @@ |
base::trace_event::RECORD_UNTIL_FULL); |
base::trace_event::TraceLog::GetInstance()->SetEnabled( |
trace_config, base::trace_event::TraceLog::RECORDING_MODE); |
- } 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); |
+ } else { |
+ // |g_tracing| is not touched in this case and Telemetry will stop tracing |
+ // on demand later. |
+ tracing::EnableStartupTracingIfConfigFileExists(); |
} |
// We want the shell::Context to outlive the MessageLoop so that pipes are |