Tracing: Added necessary plumbing to make sure clocksync metadata events are always included.

base/trace_event/memory_dump_manager.cc

Index: base/trace_event/memory_dump_manager.cc
diff --git a/base/trace_event/memory_dump_manager.cc b/base/trace_event/memory_dump_manager.cc
index a2628d9ed655f4a12ab81ceb7a0e491c3661c6ac..40fcf130be782722d5574cf42e0c86783857f144 100644
--- a/base/trace_event/memory_dump_manager.cc
+++ b/base/trace_event/memory_dump_manager.cc
@@ -661,15 +661,13 @@ void MemoryDumpManager::OnTraceLogEnabled() {
     session_state->SetTypeNameDeduplicator(
         WrapUnique(new TypeNameDeduplicator));
 
-    TRACE_EVENT_API_ADD_METADATA_EVENT(
-        TraceLog::GetCategoryGroupEnabled("__metadata"), "stackFrames",
-        "stackFrames",
+    TRACE_EVENT_METADATA_FORCED1(
+        "stackFrames", "stackFrames",
         WrapUnique(new SessionStateConvertableProxy<StackFrameDeduplicator>(
             session_state, &MemoryDumpSessionState::stack_frame_deduplicator)));
 
-    TRACE_EVENT_API_ADD_METADATA_EVENT(
-        TraceLog::GetCategoryGroupEnabled("__metadata"), "typeNames",
-        "typeNames",
+    TRACE_EVENT_METADATA_FORCED1(
+        "typeNames", "typeNames",
         WrapUnique(new SessionStateConvertableProxy<TypeNameDeduplicator>(
             session_state, &MemoryDumpSessionState::type_name_deduplicator)));
   }