Revert 197024 "Add a command line flag for dumping trace events ..."

> Add a command line flag for dumping trace events to VLOG
> 
> Only affects cc_unittests at the moment.
> 
> BUG=None
> R=danakj@chromium.org, jar@chromium.org, nduca@chromium.org
> 
> Review URL: https://codereview.chromium.org/14474006

TBR=vollick@chromium.org

Review URL: https://codereview.chromium.org/14449006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197025 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 71 deletions

diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc
index 16d11d8..38a6c0f 100644
--- a/base/debug/trace_event_impl.cc
+++ b/base/debug/trace_event_impl.cc
@@ -228,33 +228,6 @@ class TraceBufferVector : public TraceBuffer {
   DISALLOW_COPY_AND_ASSIGN(TraceBufferVector);
 };
 
-class TraceBufferDiscardsEvents : public TraceBuffer {
- public:
-  virtual ~TraceBufferDiscardsEvents() { }
-
-  virtual void AddEvent(const TraceEvent& event) { }
-  virtual bool HasMoreEvents() const { return false; }
-
-  virtual const TraceEvent& NextEvent() {
-    NOTREACHED();
-    return *static_cast<TraceEvent*>(NULL);
-  }
-
-  virtual bool IsFull() const { return false; }
-
-  virtual size_t CountEnabledByName(const unsigned char* category,
-                                    const std::string& event_name) const {
-    return 0;
-  }
-
-  virtual size_t Size() const { return 0; }
-
-  virtual const TraceEvent& GetEventAt(size_t index) const {
-    NOTREACHED();
-    return *static_cast<TraceEvent*>(NULL);
-  }
-};
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 // TraceEvent
@@ -949,8 +922,6 @@ void TraceLog::SetNotificationCallback(
 TraceBuffer* TraceLog::GetTraceBuffer() {
   if (trace_options_ & RECORD_CONTINUOUSLY)
     return new TraceBufferRingBuffer();
-  else if (trace_options_ & ECHO_TO_VLOG)
-    return new TraceBufferDiscardsEvents();
   return new TraceBufferVector();
 }
 
@@ -1016,12 +987,6 @@ void TraceLog::AddTraceEventWithThreadIdAndTimestamp(
     unsigned char flags) {
   DCHECK(name);
 
-  TimeDelta duration;
-  if (phase == TRACE_EVENT_PHASE_END && trace_options_ & ECHO_TO_VLOG) {
-    duration = timestamp - thread_event_start_times_[thread_id].top();
-    thread_event_start_times_[thread_id].pop();
-  }
-
   if (flags & TRACE_EVENT_FLAG_MANGLE_ID)
     id ^= process_id_hash_;
 
@@ -1074,32 +1039,6 @@ void TraceLog::AddTraceEventWithThreadIdAndTimestamp(
       }
     }
 
-    if (trace_options_ & ECHO_TO_VLOG) {
-      std::string thread_name = thread_names_[thread_id];
-      if (thread_colors_.find(thread_name) == thread_colors_.end())
-        thread_colors_[thread_name] = (thread_colors_.size() % 6) + 1;
-
-      std::ostringstream log;
-      log << base::StringPrintf("%s: \e[0;3%dm",
-                                thread_name.c_str(),
-                                thread_colors_[thread_name]);
-
-      size_t depth = 0;
-      if (thread_event_start_times_.find(thread_id) !=
-          thread_event_start_times_.end())
-        depth = thread_event_start_times_[thread_id].size();
-
-      for (size_t i = 0; i < depth; ++i)
-        log << "| ";
-
-      log << base::StringPrintf("'%c', %s", phase, name);
-
-      if (phase == TRACE_EVENT_PHASE_END)
-        log << base::StringPrintf(" (%.3f ms)", duration.InMillisecondsF());
-
-      VLOG(0) << log.str() << "\e[0;m";
-    }
-
     logged_events_->AddEvent(TraceEvent(thread_id,
         now, phase, category_group_enabled, name, id,
         num_args, arg_names, arg_types, arg_values,
@@ -1112,9 +1051,6 @@ void TraceLog::AddTraceEventWithThreadIdAndTimestamp(
       notifier.AddNotificationWhileLocked(EVENT_WATCH_NOTIFICATION);
   } while (0); // release lock
 
-  if (phase == TRACE_EVENT_PHASE_BEGIN && trace_options_ & ECHO_TO_VLOG)
-    thread_event_start_times_[thread_id].push(timestamp);
-
   notifier.SendNotificationIfAny();
   if (event_callback_copy != NULL) {
     event_callback_copy(phase, category_group_enabled, name, id,
diff --git a/base/debug/trace_event_impl.h b/base/debug/trace_event_impl.h
index 9af0490..51e2e1e 100644
--- a/base/debug/trace_event_impl.h
+++ b/base/debug/trace_event_impl.h
@@ -6,7 +6,6 @@
 #ifndef BASE_DEBUG_TRACE_EVENT_IMPL_H_
 #define BASE_DEBUG_TRACE_EVENT_IMPL_H_
 
-#include <stack>
 #include <string>
 #include <vector>
 
@@ -262,10 +261,7 @@ class BASE_EXPORT TraceLog {
     RECORD_CONTINUOUSLY = 1 << 1,
 
     // Enable the sampling profiler.
-    ENABLE_SAMPLING = 1 << 2,
-
-    // Echo to VLOG. Events are discared.
-    ECHO_TO_VLOG = 1 << 3
+    ENABLE_SAMPLING = 1 << 2
   };
 
   static TraceLog* GetInstance();
@@ -500,8 +496,6 @@ class BASE_EXPORT TraceLog {
   ObserverList<EnabledStateChangedObserver> enabled_state_observer_list_;
 
   base::hash_map<int, std::string> thread_names_;
-  base::hash_map<int, std::stack<TimeTicks> > thread_event_start_times_;
-  base::hash_map<std::string, int> thread_colors_;
 
   // XORed with TraceID to make it unlikely to collide with other processes.
   unsigned long long process_id_hash_;