Category group support/Renamings.

chrome/test/automation/automation_proxy.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_
 #define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 135 matching lines @@
 
   // Gets the next extension test result in |result|. Returns false if there
   // was a problem sending the result querying RPC.
   bool GetExtensionTestResult(bool* result, std::string* message);
 
   // Generic pattern for sending automation requests.
   bool SendJSONRequest(const std::string& request,
                        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;
 
   IPC::SyncChannel* channel();
 
   // AutomationMessageSender implementation.
   virtual bool Send(IPC::Message* message) WARN_UNUSED_RESULT;
   virtual bool Send(IPC::Message* message, int timeout_ms) WARN_UNUSED_RESULT;
 
@@ skipping 72 matching lines @@
 
   // Delay to let the browser execute the command.
   base::TimeDelta action_timeout_;
 
   base::PlatformThreadId listener_thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_