summaryrefslogtreecommitdiffstats
path: root/components/feedback
diff options
context:
space:
mode:
authorzhenw <zhenw@chromium.org>2015-06-02 14:46:34 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-02 21:46:59 +0000
commitd601ddc554ca0e22fe7b91b93395a421e329ef83 (patch)
treee998d1bc0a5c78b9aa9af3b3bb672733c4c16a7e /components/feedback
parent15f86fe47c852a07534d5293f1088445d76bee3e (diff)
downloadchromium_src-d601ddc554ca0e22fe7b91b93395a421e329ef83.zip
chromium_src-d601ddc554ca0e22fe7b91b93395a421e329ef83.tar.gz
chromium_src-d601ddc554ca0e22fe7b91b93395a421e329ef83.tar.bz2
[Startup Tracing] Hook up TraceConfig and remove CategoryFilter & TraceOptions
This CL hooks up TraceConfig and removes CategoryFilter and TraceOptions. This is step 3 of the following. 1- Move current CategoryFilter and TraceOptions to new file. 2- Create TraceConfig but don't use it anywhere 3- Hookup TraceConfig and remove CategoryFilter and TraceOptions. Background: Implementing TraceConfig is the first stage for startup tracing. Startup tracing design doc: https://docs.google.com/document/d/1yRCXhrQ-0rsfUgNHt9T4YdnmJYrXKN6aK56Ozk3kPVc/edit?usp=sharing TraceConfig class design doc: https://docs.google.com/document/d/1zwc6FdeYyrC7m9fC4jJqbkqpB0il9NV-MWH7lEnL0cc/edit?usp=sharing trace-config file format doc: https://docs.google.com/document/d/1auY0Buk-R2tGCzpHJzFgyTfngXTAK0mlxJc6J4M_CK4/edit?usp=sharing BUG=317481, 482098 TBR=phajdan.jr@chromium.org,nduca@chromium.org,michaelbai@chromium.org,tedchoc@chromium.org,pfeldman@chromium.org,perkj@chromium.org,ccameron@chromium.org,cbentzel@chromium.org,jam@chromium.org Review URL: https://codereview.chromium.org/1165673002 Cr-Commit-Position: refs/heads/master@{#332467}
Diffstat (limited to 'components/feedback')
-rw-r--r--components/feedback/tracing_manager.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/components/feedback/tracing_manager.cc b/components/feedback/tracing_manager.cc
index 7b116c2..04bf1b1 100644
--- a/components/feedback/tracing_manager.cc
+++ b/components/feedback/tracing_manager.cc
@@ -91,8 +91,7 @@ void TracingManager::DiscardTraceData(int id) {
void TracingManager::StartTracing() {
content::TracingController::GetInstance()->EnableRecording(
- base::trace_event::CategoryFilter(),
- base::trace_event::TraceOptions(),
+ base::trace_event::TraceConfig(),
content::TracingController::EnableRecordingDoneCallback());
}