base/test/trace_event_analyzer_unittest.cc - Issue 12150004: Category group support/Renamings.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/test/trace_event_analyzer_unittest.cc

Issue 12150004: Category group support/Renamings. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fixed comment, added better support for default filtering, fixed merge issues. Created 7 years, 9 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:

Index: base/test/trace_event_analyzer_unittest.cc

diff --git a/base/test/trace_event_analyzer_unittest.cc b/base/test/trace_event_analyzer_unittest.cc

index 60043416456aa3eac205338c6749527dc2ccb430..e13c043076e331965a8cda480b32bc48b45e162e 100644

--- a/base/test/trace_event_analyzer_unittest.cc

+++ b/base/test/trace_event_analyzer_unittest.cc

@@ -40,14 +40,12 @@ void TraceEventAnalyzerTest::BeginTracing() {

output_.json_output.clear();

buffer_.Start();

base::debug::TraceLog::GetInstance()->SetEnabled(

- true,

+ base::debug::CategoryFilter("*"),

base::debug::TraceLog::RECORD_UNTIL_FULL);

}

void TraceEventAnalyzerTest::EndTracing() {

- base::debug::TraceLog::GetInstance()->SetEnabled(

- false,

- base::debug::TraceLog::RECORD_UNTIL_FULL);

+ base::debug::TraceLog::GetInstance()->SetDisabled();

base::debug::TraceLog::GetInstance()->Flush(

base::Bind(&TraceEventAnalyzerTest::OnTraceDataCollected,

base::Unretained(this)));