Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(815)

Unified Diff: mojo/runner/desktop/launcher_process.cc

Issue 1319093002: Revert of [Startup Tracing] Add --trace-config-file flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mandoline/app/desktop/launcher_process.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « mandoline/app/desktop/launcher_process.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698