Merge gpu_trace_event back into base/debug/trace_event

content/browser/trace_controller.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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
 TraceController* TraceController::GetInstance() {
   return Singleton<TraceController>::get();
 }
 
 bool TraceController::BeginTracing(TraceSubscriber* subscriber) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!can_begin_tracing() ||
       (subscriber_ != NULL && subscriber != subscriber_))
     return false;
 
   subscriber_ = 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) {
     it->get()->SendBeginTracing();
   }
 
   return true;
 }
 
 bool TraceController::EndTracingAsync(TraceSubscriber* subscriber) {
@@ skipping 68 matching lines @@
   }
 
   if (--pending_ack_count_ == 0) {
     // All acks have been received.
     is_tracing_ = false;
 
     // Disable local trace. During this call, our OnTraceDataCollected will be
     // 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) {
       subscriber_->OnEndTracingComplete();
       // Clear subscriber so that others can use TraceController.
       subscriber_ = NULL;
     }
   }
 
   if (pending_ack_count_ == 1) {
@@ skipping 11 matching lines @@
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         NewRunnableMethod(this, &TraceController::OnTraceDataCollected, data));
     return;
   }
 
   if (subscriber_) {
     subscriber_->OnTraceDataCollected(data);
   }
 }