Merge gpu_trace_event back into base/debug/trace_event

content/browser/trace_controller.cc

Index: content/browser/trace_controller.cc
diff --git a/content/browser/trace_controller.cc b/content/browser/trace_controller.cc
index e2e046aef282e0354ceedd01ce8827d6201c00ac..aa5117519cd7bc98b0d2d22e8e1b04b59c196ef0 100644
--- a/content/browser/trace_controller.cc
+++ b/content/browser/trace_controller.cc
@@ -4,23 +4,23 @@
 
 #include "content/browser/trace_controller.h"
 
+#include "base/debug/trace_event.h"
 #include "base/task.h"
 #include "content/browser/browser_message_filter.h"
 #include "content/browser/trace_message_filter.h"
 #include "content/common/child_process_messages.h"
-#include "gpu/common/gpu_trace_event.h"
 
 
 TraceController::TraceController() :
     pending_ack_count_(0),
     is_tracing_(false),
     subscriber_(NULL) {
-  gpu::TraceLog::GetInstance()->SetOutputCallback(
+  base::debug::TraceLog::GetInstance()->SetOutputCallback(
       NewCallback(this, &TraceController::OnTraceDataCollected));
 }
 
 TraceController::~TraceController() {
-  gpu::TraceLog::GetInstance()->SetOutputCallback(NULL);
+  base::debug::TraceLog::GetInstance()->SetOutputCallback(NULL);
 }
 
 //static
@@ -39,7 +39,7 @@ bool TraceController::BeginTracing(TraceSubscriber* subscriber) {
 
   // Enable tracing
   is_tracing_ = true;
-  gpu::TraceLog::GetInstance()->SetEnabled(true);
+  base::debug::TraceLog::GetInstance()->SetEnabled(true);
 
   // Notify all child processes.
   for (FilterMap::iterator it = filters_.begin(); it != filters_.end(); ++it) {
@@ -128,7 +128,7 @@ void TraceController::OnEndTracingAck() {
     // called with the last of the local trace data. Since we are on the UI
     // thread, the call to OnTraceDataCollected will be synchronous, so we can
     // immediately call OnEndTracingComplete below.
-    gpu::TraceLog::GetInstance()->SetEnabled(false);
+    base::debug::TraceLog::GetInstance()->SetEnabled(false);
 
     // Trigger callback if one is set.
     if (subscriber_ != NULL) {