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 ccc2b0377167451fcd730b8274871c395927ba3f..80fb195c56794d81ce37af9d173d5e83f74ca6bd 100644
--- a/content/common/child_trace_message_filter.cc
+++ b/content/common/child_trace_message_filter.cc
@@ -4,25 +4,25 @@
 
 #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);
-  gpu::TraceLog::GetInstance()->SetBufferFullCallback(NULL);
+  base::debug::TraceLog::GetInstance()->SetOutputCallback(NULL);
+  base::debug::TraceLog::GetInstance()->SetBufferFullCallback(NULL);
 }
 
 void ChildTraceMessageFilter::OnFilterAdded(IPC::Channel* channel) {
   channel_ = channel;
-  gpu::TraceLog::GetInstance()->SetOutputCallback(
+  base::debug::TraceLog::GetInstance()->SetOutputCallback(
       NewCallback(this, &ChildTraceMessageFilter::OnTraceDataCollected));
-  gpu::TraceLog::GetInstance()->SetBufferFullCallback(
+  base::debug::TraceLog::GetInstance()->SetBufferFullCallback(
       NewCallback(this, &ChildTraceMessageFilter::OnTraceBufferFull));
 }
 
@@ -39,7 +39,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() {
@@ -48,13 +48,13 @@ 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);
 }
 
 void ChildTraceMessageFilter::OnGetTraceBufferPercentFull() {
-  float bpf = gpu::TraceLog::GetInstance()->GetBufferPercentFull();
+  float bpf = base::debug::TraceLog::GetInstance()->GetBufferPercentFull();
 
   channel_->Send(new ChildProcessHostMsg_TraceBufferPercentFullReply(bpf));
 }