Implement a new flow event API that allows binding flow events and regular events.

content/child/blink_platform_impl.cc

Index: content/child/blink_platform_impl.cc
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
index 41f46d498aef84c6e91b511b56d3941261746e2c..7f9565535612b3232af383c8e935032f242b97aa 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -639,9 +639,8 @@ blink::Platform::TraceEventHandle BlinkPlatformImpl::addTraceEvent(
   base::trace_event::TraceEventHandle handle =
       TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(
           phase, category_group_enabled, name, id,
-          base::PlatformThread::CurrentId(),
-          timestamp_tt,
-          num_args, arg_names, arg_types, arg_values, NULL, flags);
+          base::PlatformThread::CurrentId(), timestamp_tt, num_args, arg_names,
+          arg_types, arg_values, NULL, flags, 0);

[dsinclair, 2015/07/17 13:39:41]

kNoId

   blink::Platform::TraceEventHandle result;
   memcpy(&result, &handle, sizeof(result));
   return result;
@@ -674,18 +673,10 @@ blink::Platform::TraceEventHandle BlinkPlatformImpl::addTraceEvent(
   base::TraceTicks timestamp_tt =
       base::TraceTicks() + base::TimeDelta::FromSecondsD(timestamp);
   base::trace_event::TraceEventHandle handle =
-      TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(phase,
-                                      category_group_enabled,
-                                      name,
-                                      id,
-                                      base::PlatformThread::CurrentId(),
-                                      timestamp_tt,
-                                      num_args,
-                                      arg_names,
-                                      arg_types,
-                                      arg_values,
-                                      convertable_wrappers,
-                                      flags);
+      TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(
+          phase, category_group_enabled, name, id,
+          base::PlatformThread::CurrentId(), timestamp_tt, num_args, arg_names,
+          arg_types, arg_values, convertable_wrappers, flags, 0);

[dsinclair, 2015/07/17 13:39:41]

kNoId

   blink::Platform::TraceEventHandle result;
   memcpy(&result, &handle, sizeof(result));
   return result;