summaryrefslogtreecommitdiffstats
path: root/content/app/content_main_runner.cc
diff options
context:
space:
mode:
authornednguyen@google.com <nednguyen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-04 16:30:52 +0000
committernednguyen@google.com <nednguyen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-04 16:30:52 +0000
commit4753b9ec770f3f51722fc7df6b0568479c19acaf (patch)
treee5252f3ba3ae220e3c3c80213dc6d4088fedfe77 /content/app/content_main_runner.cc
parent99c453b803e326a1ff2a9e60bfc43ccc265401c3 (diff)
downloadchromium_src-4753b9ec770f3f51722fc7df6b0568479c19acaf.zip
chromium_src-4753b9ec770f3f51722fc7df6b0568479c19acaf.tar.gz
chromium_src-4753b9ec770f3f51722fc7df6b0568479c19acaf.tar.bz2
Refactor tracing to pass around base::debug::TraceOptions to reduce spaghetti
Previously, the options for tracing were passed around with different ad hoc systems. Strings in some places, base::debug::TraceOptions enum in others, and a content::TraceOptions in yet another. There were two separate ad-hoc string formats. Similar messes were present with category filters: sometimes we passed strings, sometimes the CategoryFilter. This patch though enormous looking simply consolidates all this ad-hockery into base::debug::TraceOptions. It may look like the call sites have gotten more verbose, but the end result of this is a consistent understanding of TraceOptions. There is one exception to this consolidation: devtools has to maintain its own mapping of string->TraceOptions encoding. This is because DevTools makes guarantees about backward compatibility: if base changes its mind about the string form of a TraceOption, devtools needs to keep supporting the old form. BUG=396081 TBR=cevans@chromium.org Review URL: https://codereview.chromium.org/425593002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app/content_main_runner.cc')
-rw-r--r--content/app/content_main_runner.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index a002013..ba132cb 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -633,7 +633,8 @@ class ContentMainRunnerImpl : public ContentMainRunner {
base::debug::TraceLog::GetInstance()->SetEnabled(
category_filter,
base::debug::TraceLog::RECORDING_MODE,
- base::debug::TraceLog::RECORD_UNTIL_FULL);
+ base::debug::TraceOptions(
+ base::debug::RECORD_UNTIL_FULL));
}
#if !defined(OS_ANDROID)
// Android tracing started at the beginning of the method.