base: Add scope support to context trace events

base/trace_event/common/trace_event_common.h

 // Copyright 2015 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.
 
 // This header file defines the set of trace_event macros without specifying
 // how the events actually get collected and stored. If you need to expose trace
 // events to some other universe, you can copy-and-paste this file as well as
 // trace_event.h, modifying the macros contained there as necessary for the
 // target platform. The end result is that multiple libraries can funnel events
 // through to a shared trace event collector.
@@ skipping 956 matching lines @@
 // snapshotted context object id.
 #define TRACE_EVENT_ENTER_CONTEXT(category_group, name, context) \
   INTERNAL_TRACE_EVENT_ADD_WITH_ID(                              \
       TRACE_EVENT_PHASE_ENTER_CONTEXT, category_group, name,     \
       TRACE_ID_DONT_MANGLE(context), TRACE_EVENT_FLAG_NONE)
 #define TRACE_EVENT_LEAVE_CONTEXT(category_group, name, context) \
   INTERNAL_TRACE_EVENT_ADD_WITH_ID(                              \
       TRACE_EVENT_PHASE_LEAVE_CONTEXT, category_group, name,     \
       TRACE_ID_DONT_MANGLE(context), TRACE_EVENT_FLAG_NONE)
 #define TRACE_EVENT_SCOPED_CONTEXT(category_group, name, context) \
-  INTERNAL_TRACE_EVENT_SCOPED_CONTEXT(category_group, name, context)
+  INTERNAL_TRACE_EVENT_SCOPED_CONTEXT(category_group, name,       \
+                                      TRACE_ID_DONT_MANGLE(context))
 
 // Macro to efficiently determine if a given category group is enabled.
 #define TRACE_EVENT_CATEGORY_GROUP_ENABLED(category_group, ret)             \
   do {                                                                      \
     INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category_group);                 \
     if (INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE()) { \
       *ret = true;                                                          \
     } else {                                                                \
       *ret = false;                                                         \
     }                                                                       \
@@ skipping 85 matching lines @@
 
 // Enum reflecting the scope of an INSTANT event. Must fit within
 // TRACE_EVENT_FLAG_SCOPE_MASK.
 #define TRACE_EVENT_SCOPE_GLOBAL (static_cast<unsigned char>(0 << 3))
 #define TRACE_EVENT_SCOPE_PROCESS (static_cast<unsigned char>(1 << 3))
 #define TRACE_EVENT_SCOPE_THREAD (static_cast<unsigned char>(2 << 3))
 
 #define TRACE_EVENT_SCOPE_NAME_GLOBAL ('g')
 #define TRACE_EVENT_SCOPE_NAME_PROCESS ('p')
 #define TRACE_EVENT_SCOPE_NAME_THREAD ('t')