Merge gpu_trace_event back into base/debug/trace_event

content/common/child_trace_message_filter.cc

Index: content/common/child_trace_message_filter.cc
diff --git a/content/common/child_trace_message_filter.cc b/content/common/child_trace_message_filter.cc
index 356e423a09cd1046b6b685fc6cf35daa36aae053..f3628afa3dfb22edc141b94f1b0e4eadc886f8ca 100644
--- a/content/common/child_trace_message_filter.cc
+++ b/content/common/child_trace_message_filter.cc
@@ -4,22 +4,22 @@
 
 #include "content/common/child_trace_message_filter.h"
 
+#include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "content/common/child_process.h"
 #include "content/common/child_process_messages.h"
-#include "gpu/common/gpu_trace_event.h"
 
 
 ChildTraceMessageFilter::ChildTraceMessageFilter() : channel_(NULL) {
 }
 
 ChildTraceMessageFilter::~ChildTraceMessageFilter() {
-  gpu::TraceLog::GetInstance()->SetOutputCallback(NULL);
+  base::debug::TraceLog::GetInstance()->SetOutputCallback(NULL);
 }
 
 void ChildTraceMessageFilter::OnFilterAdded(IPC::Channel* channel) {
   channel_ = channel;
-  gpu::TraceLog::GetInstance()->SetOutputCallback(
+  base::debug::TraceLog::GetInstance()->SetOutputCallback(
       NewCallback(this, &ChildTraceMessageFilter::OnTraceDataCollected));
 }
 
@@ -34,7 +34,7 @@ bool ChildTraceMessageFilter::OnMessageReceived(const IPC::Message& message) {
 }
 
 void ChildTraceMessageFilter::OnBeginTracing() {
-  gpu::TraceLog::GetInstance()->SetEnabled(true);
+  base::debug::TraceLog::GetInstance()->SetEnabled(true);
 }
 
 void ChildTraceMessageFilter::OnEndTracing() {
@@ -43,7 +43,7 @@ void ChildTraceMessageFilter::OnEndTracing() {
   // EndTracingAck below.
   // We are already on the IO thread, so it is guaranteed that
   // OnTraceDataCollected is not deferred.
-  gpu::TraceLog::GetInstance()->SetEnabled(false);
+  base::debug::TraceLog::GetInstance()->SetEnabled(false);
 
   channel_->Send(new ChildProcessHostMsg_EndTracingAck);
 }