Merge gpu_trace_event back into base/debug/trace_event

content/renderer/renderer_gl_context.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/renderer/renderer_gl_context.h"
 
+#include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/shared_memory.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/command_buffer_proxy.h"
 #include "content/renderer/gpu_channel_host.h"
 #include "content/renderer/gpu_video_service_host.h"
 #include "content/renderer/media/gles2_video_decode_context.h"
 #include "content/renderer/render_thread.h"
 #include "content/renderer/render_widget.h"
 #include "content/renderer/transport_texture_host.h"
 #include "content/renderer/transport_texture_service.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel_handle.h"
 
 #if defined(ENABLE_GPU)
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/common/constants.h"
-#include "gpu/common/gpu_trace_event.h"
 #include "gpu/GLES2/gles2_command_buffer.h"
 #endif  // ENABLE_GPU
 
 namespace {
 
 const int32 kCommandBufferSize = 1024 * 1024;
 // TODO(kbr): make the transfer buffer size configurable via context
 // creation attributes.
 const int32 kTransferBufferSize = 1024 * 1024;
 
@@ skipping 242 matching lines @@
     if (context->command_buffer_->GetLastState().error != gpu::error::kNoError)
       return false;
   } else {
     gles2::SetGLContext(NULL);
   }
 
   return true;
 }
 
 bool RendererGLContext::SwapBuffers() {
-  GPU_TRACE_EVENT0("gpu", "RendererGLContext::SwapBuffers");
+  TRACE_EVENT0("gpu", "RendererGLContext::SwapBuffers");
   // Don't request latest error status from service. Just use the locally cached
   // information from the last flush.
   if (command_buffer_->GetLastState().error != gpu::error::kNoError)
     return false;
 
   gles2_implementation_->SwapBuffers();
   return true;
 }
 
 media::VideoDecodeEngine* RendererGLContext::CreateVideoDecodeEngine() {
@@ skipping 270 matching lines @@
 }
 
 bool RendererGLContext::GetChildToParentLatch(uint32* child_to_parent_latch) {
   if (parent_.get()) {
     *child_to_parent_latch = child_to_parent_latch_;
     return true;
   }
   return false;
 }