chrome/test/ui/ui_test.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: chrome/test/ui/ui_test.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: chrome/test/ui/ui_test.cc

diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc

index cf59949049e853a68e5f656b29bb2d688ae00399..a635046f38b4e4c37cde68eb0e2a6cd51b46680c 100644

--- a/chrome/test/ui/ui_test.cc

+++ b/chrome/test/ui/ui_test.cc

@@ -502,8 +502,8 @@ void UITestBase::AppendBrowserLaunchSwitch(const char* name,

launch_arguments_.AppendSwitchASCII(name, value);

}

-bool UITestBase::BeginTracing(const std::string& categories) {

- return automation()->BeginTracing(categories);

+bool UITestBase::BeginTracing(const std::string& category_patterns) {

+ return automation()->BeginTracing(category_patterns);

}

std::string UITestBase::EndTracing() {