Category group support/Renamings.

chrome/test/base/tracing.cc

 // 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.
 
 #include "chrome/test/base/tracing.h"
 
 #include "base/debug/trace_event.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/trace_controller.h"
 #include "content/public/browser/trace_subscriber.h"
 #include "content/public/test/test_utils.h"
 
 namespace {
 
 using content::BrowserThread;
 
 class InProcessTraceController : public content::TraceSubscriber {
  public:
   static InProcessTraceController* GetInstance() {
     return Singleton<InProcessTraceController>::get();
   }
 
   InProcessTraceController()
       : is_waiting_on_watch_(false),
         watch_notification_count_(0) {}
   virtual ~InProcessTraceController() {}
 
-  bool BeginTracing(const std::string& categories) {
+  bool BeginTracing(const std::string& category_patterns) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     return content::TraceController::GetInstance()->BeginTracing(
-        this, categories);
+        this, category_patterns);
   }
 
-  bool BeginTracingWithWatch(const std::string& categories,
+  bool BeginTracingWithWatch(const std::string& category_patterns,
                              const std::string& category_name,
                              const std::string& event_name,
                              int num_occurrences) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(num_occurrences > 0);
     watch_notification_count_ = num_occurrences;
-    return BeginTracing(categories) &&
+    return BeginTracing(category_patterns) &&
            content::TraceController::GetInstance()->SetWatchEvent(
                this, category_name, event_name);
   }
 
   bool WaitForWatchEvent(base::TimeDelta timeout) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     if (watch_notification_count_ == 0)
       return true;
 
     if (timeout != base::TimeDelta()) {
@@ skipping 74 matching lines @@
   bool is_waiting_on_watch_;
   int watch_notification_count_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessTraceController);
 };
 
 }  // namespace
 
 namespace tracing {
 
-bool BeginTracing(const std::string& categories) {
-  return InProcessTraceController::GetInstance()->BeginTracing(categories);
+bool BeginTracing(const std::string& category_patterns) {
+  return InProcessTraceController::GetInstance()->BeginTracing(
+                                                             category_patterns);

[dsinclair, 2013/02/22 21:13:44]

nit: indenting.

[rterrazas, 2013/02/25 05:55:02]

Done.

 }
 
-bool BeginTracingWithWatch(const std::string& categories,
+bool BeginTracingWithWatch(const std::string& category_patterns,
                            const std::string& category_name,
                            const std::string& event_name,
                            int num_occurrences) {
   return InProcessTraceController::GetInstance()->BeginTracingWithWatch(
-      categories, category_name, event_name, num_occurrences);
+      category_patterns, category_name, event_name, num_occurrences);
 }
 
 bool WaitForWatchEvent(base::TimeDelta timeout) {
   return InProcessTraceController::GetInstance()->WaitForWatchEvent(timeout);
 }
 
 bool EndTracing(std::string* json_trace_output) {
   return InProcessTraceController::GetInstance()->EndTracing(json_trace_output);
 }
 
 }  // namespace tracing