From d936677a24d0a18fc35935a999b066496f9a6ec7 Mon Sep 17 00:00:00 2001 From: "rubentopo@gmail.com" Date: Fri, 19 Apr 2013 08:49:03 +0000 Subject: Category group support/Renamings. Related review: https://codereview.chromium.org/11823016/ BUG=168284 TEST=TraceEventTestFixture.Categories, TraceEventTestFixture.CategoryFilter R=nduca Review URL: https://chromiumcodereview.appspot.com/12150004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195109 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/automation/automation_proxy.cc | 4 ++-- chrome/test/automation/automation_proxy.h | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'chrome/test/automation') diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc index 8a0ed36..37e173c 100644 --- a/chrome/test/automation/automation_proxy.cc +++ b/chrome/test/automation/automation_proxy.cc @@ -404,9 +404,9 @@ void AutomationProxy::ResetChannel() { tracker_->put_channel(NULL); } -bool AutomationProxy::BeginTracing(const std::string& categories) { +bool AutomationProxy::BeginTracing(const std::string& category_patterns) { bool result = false; - bool send_success = Send(new AutomationMsg_BeginTracing(categories, + bool send_success = Send(new AutomationMsg_BeginTracing(category_patterns, &result)); return send_success && result; } diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h index 788a3dc..3dfb7f1 100644 --- a/chrome/test/automation/automation_proxy.h +++ b/chrome/test/automation/automation_proxy.h @@ -153,19 +153,21 @@ class AutomationProxy : public IPC::Listener, public AutomationMessageSender { int timeout_ms, std::string* response) WARN_UNUSED_RESULT; - // Begin tracing specified categories on the browser instance. Blocks until - // browser acknowledges that tracing has begun (or failed if false is - // returned). |categories| is a comma-delimited list of category wildcards. - // A category can have an optional '-' prefix to make it an excluded category. - // Either all categories must be included or all must be excluded. + // Begin tracing specified category_patterns on the browser instance. Blocks + // until browser acknowledges that tracing has begun (or failed if false is + // returned). |category_patterns| is a comma-delimited list of category + // wildcards. + // A category pattern can have an optional '-' prefix to exclude category + // groups that contain matching category. + // Either all category_patterns must be included or all must be excluded. // // Example: BeginTracing("test_MyTest*"); // Example: BeginTracing("test_MyTest*,test_OtherStuff"); // Example: BeginTracing("-excluded_category1,-excluded_category2"); // // See base/event_trace.h for documentation of included and excluded - // categories. - bool BeginTracing(const std::string& categories) WARN_UNUSED_RESULT; + // category_patterns. + bool BeginTracing(const std::string& category_patterns) WARN_UNUSED_RESULT; // End trace and collect the trace output as a json string. bool EndTracing(std::string* json_trace_output) WARN_UNUSED_RESULT; -- cgit v1.1