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

Unified Diff: content/app/android/library_loader_hooks.cc

Issue 2683913002: Enable startup tracing from command line flags in components/tracing (Closed)
Patch Set: . Created 3 years, 10 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
Index: content/app/android/library_loader_hooks.cc
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index 77a7111b235dff5bdf4ea0a466885347996cc42c..df773a37ba895f97c4257cdf07417aecbd11dd2a 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -17,9 +17,7 @@
#include "base/strings/string_util.h"
#include "base/trace_event/trace_event.h"
#include "base/tracked_objects.h"
-#include "components/tracing/browser/trace_config_file.h"
-#include "components/tracing/common/trace_to_console.h"
-#include "components/tracing/common/tracing_switches.h"
+#include "components/tracing/common/startup_command_parser.h"
#include "content/app/android/app_jni_registrar.h"
#include "content/browser/android/browser_jni_registrar.h"
#include "content/common/android/common_jni_registrar.h"
@@ -126,26 +124,8 @@ bool LibraryLoaded(JNIEnv* env, jclass clazz) {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
// Enable startup tracing asap to avoid early TRACE_EVENT calls being ignored.
- if (command_line->HasSwitch(switches::kTraceStartup)) {
- base::trace_event::TraceConfig trace_config(
- command_line->GetSwitchValueASCII(switches::kTraceStartup), "");
- base::trace_event::TraceLog::GetInstance()->SetEnabled(
- trace_config, base::trace_event::TraceLog::RECORDING_MODE);
- } else if (command_line->HasSwitch(switches::kTraceToConsole)) {
- base::trace_event::TraceConfig trace_config =
- tracing::GetConfigForTraceToConsole();
- LOG(ERROR) << "Start " << switches::kTraceToConsole
- << " with CategoryFilter '"
- << trace_config.ToCategoryFilterString() << "'.";
- base::trace_event::TraceLog::GetInstance()->SetEnabled(
- trace_config,
- base::trace_event::TraceLog::RECORDING_MODE);
- } else if (tracing::TraceConfigFile::GetInstance()->IsEnabled()) {
- // This checks kTraceConfigFile switch.
- base::trace_event::TraceLog::GetInstance()->SetEnabled(
- tracing::TraceConfigFile::GetInstance()->GetTraceConfig(),
- base::trace_event::TraceLog::RECORDING_MODE);
- }
+ tracing::ParseStartupTraceCommands(*command_line,
+ true /* can_access_file_system */);
// Android's main browser loop is custom so we set the browser
// name here as early as possible.

Powered by Google App Engine
This is Rietveld 408576698