Merge gpu_trace_event back into base/debug/trace_event

gpu/command_buffer/client/cmd_buffer_helper.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.
 
 // This file contains the implementation of the command buffer helper class.
 
 #include "../client/cmd_buffer_helper.h"
 #include "../common/command_buffer.h"
-#include "gpu/common/gpu_trace_event.h"
+#include "base/debug/trace_event.h"
 
 namespace gpu {
 
 CommandBufferHelper::CommandBufferHelper(CommandBuffer* command_buffer)
     : command_buffer_(command_buffer),
       entries_(NULL),
       total_entry_count_(0),
       usable_entry_count_(0),
       token_(0),
       last_token_read_(-1),
@@ skipping 96 matching lines @@
 // space may not be available.
 void CommandBufferHelper::WaitForAvailableEntries(int32 count) {
   GPU_CHECK(count < usable_entry_count_);
   if (put_ + count > usable_entry_count_) {
     // There's not enough room between the current put and the end of the
     // buffer, so we need to wrap. We will add a jump back to the start, but we
     // need to make sure get wraps first, actually that get is 1 or more (since
     // put will wrap to 0 after we add the jump).
     GPU_DCHECK_LE(1, put_);
     if (get_ > put_ || get_ == 0) {
-      GPU_TRACE_EVENT0("gpu", "CommandBufferHelper::WaitForAvailableEntries");
+      TRACE_EVENT0("gpu", "CommandBufferHelper::WaitForAvailableEntries");
       while (get_ > put_ || get_ == 0) {
         // Do not loop forever if the flush fails, meaning the command buffer
         // reader has shutdown.
         if (!FlushSync())
           return;
       }
     }
     // Insert a jump back to the beginning.
     cmd::Jump::Set(&entries_[put_], 0);
     put_ = 0;
   }
   if (AvailableEntries() < count) {
-    GPU_TRACE_EVENT0("gpu", "CommandBufferHelper::WaitForAvailableEntries1");
+    TRACE_EVENT0("gpu", "CommandBufferHelper::WaitForAvailableEntries1");
     while (AvailableEntries() < count) {
       // Do not loop forever if the flush fails, meaning the command buffer
       // reader has shutdown.
       if (!FlushSync())
         return;
     }
   }
   // Force a flush if the buffer is getting half full, or even earlier if the
   // reader is known to be idle.
   int32 pending =
@@ skipping 21 matching lines @@
   SynchronizeState(state);
   return static_cast<error::Error>(state.error);
 }
 
 void CommandBufferHelper::SynchronizeState(CommandBuffer::State state) {
   get_ = state.get_offset;
   last_token_read_ = state.token;
 }
 
 }  // namespace gpu