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

base/trace_event/trace_event_unittest.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 "base/trace_event/trace_event.h"
 
 #include <math.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 1239 matching lines @@
       out->append("\"metadata_value\"");
     }
 
    private:
     int* num_calls_;
   };
 
   std::unique_ptr<ConvertableToTraceFormat> conv1(new Convertable(&num_calls));
   std::unique_ptr<Convertable> conv2(new Convertable(&num_calls));
 
-  BeginTrace();
-  TRACE_EVENT_API_ADD_METADATA_EVENT(
-      TraceLog::GetCategoryGroupEnabled("__metadata"), "metadata_event_1",
-      "metadata_arg_name", std::move(conv1));
-  TRACE_EVENT_API_ADD_METADATA_EVENT(
-      TraceLog::GetCategoryGroupEnabled("__metadata"), "metadata_event_2",
-      "metadata_arg_name", std::move(conv2));
+  BeginSpecificTrace("irrelevant_cat");
+  TRACE_EVENT_METADATA_FORCED1("metadata_event_1", "metadata_arg_name",
+                               std::move(conv1));
+  TRACE_EVENT_METADATA_FORCED1("metadata_event_2", "metadata_arg_name",
+                               std::move(conv2));
   // |AppendAsTraceFormat| should only be called on flush, not when the event
   // is added.
   ASSERT_EQ(0, num_calls);
   EndTraceAndFlush();
   ASSERT_EQ(2, num_calls);
   EXPECT_TRUE(FindNamePhaseKeyValue("metadata_event_1", "M",
                                     "metadata_arg_name", "metadata_value"));
   EXPECT_TRUE(FindNamePhaseKeyValue("metadata_event_2", "M",
                                     "metadata_arg_name", "metadata_value"));
 
@@ skipping 1837 matching lines @@
 }
 
 TEST_F(TraceEventTestFixture, SyntheticDelayConfigurationToString) {
   const char filter[] = "DELAY(test.Delay;16;oneshot)";
   TraceConfig config(filter, "");
   EXPECT_EQ(filter, config.ToCategoryFilterString());
 }
 
 }  // namespace trace_event
 }  // namespace base