Category group support/Renamings.

base/debug/trace_event_android.cc

Index: base/debug/trace_event_android.cc
diff --git a/base/debug/trace_event_android.cc b/base/debug/trace_event_android.cc
index 70e377b3b0d1eeeb93740f48e9bf5d822e37c99c..8cc5f3cb1e92d690bf9c8992c02bc4c661386994 100644
--- a/base/debug/trace_event_android.cc
+++ b/base/debug/trace_event_android.cc
@@ -17,7 +17,7 @@ int g_atrace_fd = -1;
 const char* kATraceMarkerFile = "/sys/kernel/debug/tracing/trace_marker";
 
 void WriteEvent(char phase,
-                const char* category,
+                const char* category_group,
                 const char* name,
                 unsigned long long id,
                 int num_args,
@@ -48,7 +48,7 @@ void WriteEvent(char phase,
   }
 
   out += '|';
-  out += category;
+  out += category_group;
   write(g_atrace_fd, out.c_str(), out.size());
 }
 
@@ -75,7 +75,7 @@ void TraceLog::StopATrace() {
 }
 
 void TraceLog::SendToATrace(char phase,
-                            const char* category,
+                            const char* category_group,
                             const char* name,
                             unsigned long long id,
                             int num_args,
@@ -88,20 +88,20 @@ void TraceLog::SendToATrace(char phase,
 
   switch (phase) {
     case TRACE_EVENT_PHASE_BEGIN:
-      WriteEvent('B', category, name, id,
+      WriteEvent('B', category_group, name, id,
                  num_args, arg_names, arg_types, arg_values, flags);
       break;
 
     case TRACE_EVENT_PHASE_END:
-      // Though a single 'E' is enough, here append pid, name and category etc.
-      // so that unpaired events can be found easily.
-      WriteEvent('E', category, name, id,
+      // Though a single 'E' is enough, here append pid, name and
+      // category_group etc. So that unpaired events can be found easily.
+      WriteEvent('E', category_group, name, id,
                  num_args, arg_names, arg_types, arg_values, flags);
       break;
 
     case TRACE_EVENT_PHASE_INSTANT:
       // Simulate an instance event with a pair of begin/end events.
-      WriteEvent('B', category, name, id,
+      WriteEvent('B', category_group, name, id,
                  num_args, arg_names, arg_types, arg_values, flags);
       write(g_atrace_fd, "E", 1);
       break;
@@ -114,7 +114,7 @@ void TraceLog::SendToATrace(char phase,
         if (flags & TRACE_EVENT_FLAG_HAS_ID)
           StringAppendF(&out, "-%" PRIx64, static_cast<uint64>(id));
         StringAppendF(&out, "|%d|%s",
-                      static_cast<int>(arg_values[i]), category);
+                      static_cast<int>(arg_values[i]), category_group);
         write(g_atrace_fd, out.c_str(), out.size());
       }
       break;
@@ -126,11 +126,11 @@ void TraceLog::SendToATrace(char phase,
 }
 
 // Must be called with lock_ locked.
-void TraceLog::ApplyATraceEnabledFlag(unsigned char* category_enabled) {
+void TraceLog::ApplyATraceEnabledFlag(unsigned char* category_group_enabled) {
   if (g_atrace_fd != -1)
-    *category_enabled |= ATRACE_ENABLED;
+    *category_group_enabled |= ATRACE_ENABLED;
   else
-    *category_enabled &= ~ATRACE_ENABLED;
+    *category_group_enabled &= ~ATRACE_ENABLED;
 }
 
 }  // namespace debug