[Tracing] Remove context_id in favor of traits

base/trace_event/trace_event_impl.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_impl.h"
 
 #include "base/format_macros.h"
 #include "base/json/string_escape.h"
 #include "base/process/process_handle.h"
 #include "base/stl_util.h"
@@ skipping 40 matching lines @@
 }
 
 TraceEvent::~TraceEvent() {
 }
 
 void TraceEvent::CopyFrom(const TraceEvent& other) {
   timestamp_ = other.timestamp_;
   thread_timestamp_ = other.thread_timestamp_;
   duration_ = other.duration_;
   id_ = other.id_;
-  context_id_ = other.context_id_;
   category_group_enabled_ = other.category_group_enabled_;
   name_ = other.name_;
   if (other.flags_ & TRACE_EVENT_FLAG_HAS_PROCESS_ID)
     process_id_ = other.process_id_;
   else
     thread_id_ = other.thread_id_;
   phase_ = other.phase_;
   flags_ = other.flags_;
   parameter_copy_storage_ = other.parameter_copy_storage_;
 
   for (int i = 0; i < kTraceMaxNumArgs; ++i) {
     arg_names_[i] = other.arg_names_[i];
     arg_types_[i] = other.arg_types_[i];
     arg_values_[i] = other.arg_values_[i];
     convertable_values_[i] = other.convertable_values_[i];
   }
 }
 
 void TraceEvent::Initialize(
     int thread_id,
     TimeTicks timestamp,
     ThreadTicks thread_timestamp,
     char phase,
     const unsigned char* category_group_enabled,
     const char* name,
     unsigned long long id,
-    unsigned long long context_id,
     unsigned long long bind_id,
     int num_args,
     const char** arg_names,
     const unsigned char* arg_types,
     const unsigned long long* arg_values,
     const scoped_refptr<ConvertableToTraceFormat>* convertable_values,
     unsigned int flags) {
   timestamp_ = timestamp;
   thread_timestamp_ = thread_timestamp;
   duration_ = TimeDelta::FromInternalValue(-1);
   id_ = id;
-  context_id_ = context_id;
   category_group_enabled_ = category_group_enabled;
   name_ = name;
   thread_id_ = thread_id;
   phase_ = phase;
   flags_ = flags;
   bind_id_ = bind_id;
 
   // Clamp num_args since it may have been set by a third_party library.
   num_args = (num_args > kTraceMaxNumArgs) ? kTraceMaxNumArgs : num_args;
   int i = 0;
@@ skipping 253 matching lines @@
   if ((flags_ & TRACE_EVENT_FLAG_FLOW_OUT) ||
       (flags_ & TRACE_EVENT_FLAG_FLOW_IN)) {
     StringAppendF(out, ",\"bind_id\":\"0x%" PRIx64 "\"",
                   static_cast<uint64>(bind_id_));
   }
   if (flags_ & TRACE_EVENT_FLAG_FLOW_IN)
     StringAppendF(out, ",\"flow_in\":true");
   if (flags_ & TRACE_EVENT_FLAG_FLOW_OUT)
     StringAppendF(out, ",\"flow_out\":true");
 
-  // Similar to id_, print the context_id as hex if present.
-  if (flags_ & TRACE_EVENT_FLAG_HAS_CONTEXT_ID)
-    StringAppendF(out, ",\"cid\":\"0x%" PRIx64 "\"",
-                  static_cast<uint64>(context_id_));
-
   // Instant events also output their scope.
   if (phase_ == TRACE_EVENT_PHASE_INSTANT) {
     char scope = '?';
     switch (flags_ & TRACE_EVENT_FLAG_SCOPE_MASK) {
       case TRACE_EVENT_SCOPE_GLOBAL:
         scope = TRACE_EVENT_SCOPE_NAME_GLOBAL;
         break;
 
       case TRACE_EVENT_SCOPE_PROCESS:
         scope = TRACE_EVENT_SCOPE_NAME_PROCESS;
@@ skipping 27 matching lines @@
         AppendValueAsJSON(arg_types_[i], arg_values_[i], &value_as_text);
 
       *out << value_as_text;
     }
     *out << "}";
   }
 }
 
 }  // namespace trace_event
 }  // namespace base