| Index: base/debug/trace_event_impl.cc
 | 
| diff --git a/base/debug/trace_event.cc b/base/debug/trace_event_impl.cc
 | 
| similarity index 90%
 | 
| copy from base/debug/trace_event.cc
 | 
| copy to base/debug/trace_event_impl.cc
 | 
| index c5547697ee822920492f7ef7f1cf0e50b7f9843c..0608c78957e3cf8149b2b5aefc50916194d03844 100644
 | 
| --- a/base/debug/trace_event.cc
 | 
| +++ b/base/debug/trace_event_impl.cc
 | 
| @@ -2,11 +2,12 @@
 | 
|  // Use of this source code is governed by a BSD-style license that can be
 | 
|  // found in the LICENSE file.
 | 
|  
 | 
| -#include "base/debug/trace_event.h"
 | 
| +#include "base/debug/trace_event_impl.h"
 | 
|  
 | 
|  #include <algorithm>
 | 
|  
 | 
|  #include "base/bind.h"
 | 
| +#include "base/debug/trace_event.h"
 | 
|  #include "base/file_util.h"
 | 
|  #include "base/format_macros.h"
 | 
|  #include "base/lazy_instance.h"
 | 
| @@ -636,33 +637,6 @@ void TraceLog::AddTraceEventEtw(char phase,
 | 
|                             TRACE_EVENT_FLAG_COPY, "id", id, "extra", extra);
 | 
|  }
 | 
|  
 | 
| -void TraceLog::AddCounterEvent(const unsigned char* category_enabled,
 | 
| -                               const char* name,
 | 
| -                               unsigned long long id,
 | 
| -                               const char* value1_name, int value1_val,
 | 
| -                               const char* value2_name, int value2_val,
 | 
| -                               unsigned char flags) {
 | 
| -  int num_args = value2_name ? 2 : 1;
 | 
| -  const char* arg_names[2] = {value1_name, value2_name};
 | 
| -  unsigned char arg_types[2];
 | 
| -  unsigned long long arg_values[2];
 | 
| -  trace_event_internal::SetTraceValue(value1_val, &arg_types[0],
 | 
| -                                      &arg_values[0]);
 | 
| -  trace_event_internal::SetTraceValue(value2_val, &arg_types[1],
 | 
| -                                      &arg_values[1]);
 | 
| -  AddTraceEvent(TRACE_EVENT_PHASE_COUNTER,
 | 
| -                category_enabled,
 | 
| -                name,
 | 
| -                id,
 | 
| -                num_args,
 | 
| -                arg_names,
 | 
| -                arg_types,
 | 
| -                arg_values,
 | 
| -                trace_event_internal::kNoThreshholdBeginId,
 | 
| -                trace_event_internal::kNoThresholdValue,
 | 
| -                flags);
 | 
| -}
 | 
| -
 | 
|  void TraceLog::AddClockSyncMetadataEvents() {
 | 
|  #if defined(OS_ANDROID)
 | 
|    // Since Android does not support sched_setaffinity, we cannot establish clock
 | 
| @@ -744,51 +718,3 @@ void TraceLog::SetProcessID(int process_id) {
 | 
|  
 | 
|  }  // namespace debug
 | 
|  }  // namespace base
 | 
| -
 | 
| -namespace trace_event_internal {
 | 
| -
 | 
| -void TraceEndOnScopeClose::Initialize(const unsigned char* category_enabled,
 | 
| -                                      const char* name) {
 | 
| -  data_.category_enabled = category_enabled;
 | 
| -  data_.name = name;
 | 
| -  p_data_ = &data_;
 | 
| -}
 | 
| -
 | 
| -void TraceEndOnScopeClose::AddEventIfEnabled() {
 | 
| -  // Only called when p_data_ is non-null.
 | 
| -  if (*p_data_->category_enabled) {
 | 
| -    TRACE_EVENT_API_ADD_TRACE_EVENT(
 | 
| -        TRACE_EVENT_PHASE_END,
 | 
| -        p_data_->category_enabled,
 | 
| -        p_data_->name, kNoEventId,
 | 
| -        kZeroNumArgs, NULL, NULL, NULL,
 | 
| -        kNoThreshholdBeginId, kNoThresholdValue, TRACE_EVENT_FLAG_NONE);
 | 
| -  }
 | 
| -}
 | 
| -
 | 
| -void TraceEndOnScopeCloseThreshold::Initialize(
 | 
| -                                      const unsigned char* category_enabled,
 | 
| -                                      const char* name,
 | 
| -                                      int threshold_begin_id,
 | 
| -                                      long long threshold) {
 | 
| -  data_.category_enabled = category_enabled;
 | 
| -  data_.name = name;
 | 
| -  data_.threshold_begin_id = threshold_begin_id;
 | 
| -  data_.threshold = threshold;
 | 
| -  p_data_ = &data_;
 | 
| -}
 | 
| -
 | 
| -void TraceEndOnScopeCloseThreshold::AddEventIfEnabled() {
 | 
| -  // Only called when p_data_ is non-null.
 | 
| -  if (*p_data_->category_enabled) {
 | 
| -    TRACE_EVENT_API_ADD_TRACE_EVENT(
 | 
| -        TRACE_EVENT_PHASE_END,
 | 
| -        p_data_->category_enabled,
 | 
| -        p_data_->name, kNoEventId,
 | 
| -        kZeroNumArgs, NULL, NULL, NULL,
 | 
| -        p_data_->threshold_begin_id, p_data_->threshold,
 | 
| -        TRACE_EVENT_FLAG_NONE);
 | 
| -  }
 | 
| -}
 | 
| -
 | 
| -}  // namespace trace_event_internal
 | 
| 
 |