tracing: split out the CategoryRegistry from the TraceLog

base/trace_event/trace_event.h

Index: base/trace_event/trace_event.h
diff --git a/base/trace_event/trace_event.h b/base/trace_event/trace_event.h
index 31b9f577e6fed6b8c45c11623e813940cfb15a3e..0299ddd0cb70356313e3c95fa195b09e50d36246 100644
--- a/base/trace_event/trace_event.h
+++ b/base/trace_event/trace_event.h
@@ -19,6 +19,7 @@
 #include "base/time/time.h"
 #include "base/trace_event/common/trace_event_common.h"
 #include "base/trace_event/heap_profiler.h"
+#include "base/trace_event/trace_category.h"
 #include "base/trace_event/trace_event_system_stats_monitor.h"
 #include "base/trace_event/trace_log.h"
 #include "build/build_config.h"
@@ -54,14 +55,14 @@
 
 #define INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE() \
   UNLIKELY(*INTERNAL_TRACE_EVENT_UID(category_group_enabled) &           \
-           (base::trace_event::TraceLog::ENABLED_FOR_RECORDING |         \
-            base::trace_event::TraceLog::ENABLED_FOR_ETW_EXPORT |        \
-            base::trace_event::TraceLog::ENABLED_FOR_FILTERING))
+           (base::trace_event::TraceCategory::ENABLED_FOR_RECORDING |         \
+            base::trace_event::TraceCategory::ENABLED_FOR_ETW_EXPORT |        \
+            base::trace_event::TraceCategory::ENABLED_FOR_FILTERING))
 
 #define INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_FILTERING_MODE( \
     category_group_enabled)                                             \
   UNLIKELY(category_group_enabled&                                      \
-               base::trace_event::TraceLog::ENABLED_FOR_FILTERING)
+               base::trace_event::TraceCategory::ENABLED_FOR_FILTERING)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Implementation specific tracing API definitions.