Category group support/Renamings.

content/renderer/render_thread_impl.cc

Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 96b4b3071dde99fdcdd4af86fc6ea0a13bbbeb83..aecf3dc6fc68da0384aebfdb9d73db2fe62abd82 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -207,12 +207,12 @@ void AddHistogramSample(void* hist, int sample) {
 }
 
 #if defined(ENABLE_WEBRTC)
-const unsigned char* GetCategoryEnabled(const char* name) {
-  return TRACE_EVENT_API_GET_CATEGORY_ENABLED(name);
+const unsigned char* GetCategoryGroupEnabled(const char* category_group) {
+  return TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(category_group);
 }
 
 void AddTraceEvent(char phase,
-                   const unsigned char* category_enabled,
+                   const unsigned char* category_group_enabled,
                    const char* name,
                    unsigned long long id,
                    int num_args,
@@ -220,9 +220,9 @@ void AddTraceEvent(char phase,
                    const unsigned char* arg_types,
                    const unsigned long long* arg_values,
                    unsigned char flags) {
-  TRACE_EVENT_API_ADD_TRACE_EVENT(phase, category_enabled, name, id, num_args,
-                                  arg_names, arg_types, arg_values, NULL,
-                                  flags);
+  TRACE_EVENT_API_ADD_TRACE_EVENT(phase, category_group_enabled, name, id,
+                                  num_args, arg_names, arg_types, arg_values,
+                                  NULL, flags);
 }
 #endif
 
@@ -364,7 +364,7 @@ void RenderThreadImpl::Init() {
   AddFilter(db_message_filter_.get());
 
 #if defined(ENABLE_WEBRTC)
-  webrtc::SetupEventTracer(&GetCategoryEnabled, &AddTraceEvent);
+  webrtc::SetupEventTracer(&GetCategoryGroupEnabled, &AddTraceEvent);
 
   peer_connection_tracker_.reset(new PeerConnectionTracker());
   AddObserver(peer_connection_tracker_.get());