| Index: base/trace_event/trace_log.h
|
| diff --git a/base/trace_event/trace_log.h b/base/trace_event/trace_log.h
|
| index 8aa7ff875f1b15c96c1a5d5e89c05666dee34d31..a6a5ac81947966a980011241a97edcef19bc8fb8 100644
|
| --- a/base/trace_event/trace_log.h
|
| +++ b/base/trace_event/trace_log.h
|
| @@ -190,12 +190,12 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider {
|
| const unsigned long long* arg_values,
|
| const scoped_refptr<ConvertableToTraceFormat>* convertable_values,
|
| unsigned int flags);
|
| - TraceEventHandle AddTraceEventWithContextId(
|
| + TraceEventHandle AddTraceEventWithBindId(
|
| 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,
|
| @@ -219,7 +219,6 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider {
|
| const unsigned char* category_group_enabled,
|
| const char* name,
|
| unsigned long long id,
|
| - unsigned long long context_id,
|
| int thread_id,
|
| const TimeTicks& timestamp,
|
| int num_args,
|
| @@ -233,7 +232,6 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider {
|
| const unsigned char* category_group_enabled,
|
| const char* name,
|
| unsigned long long id,
|
| - unsigned long long context_id,
|
| unsigned long long bind_id,
|
| int thread_id,
|
| const TimeTicks& timestamp,
|
|
|