Merge gpu_trace_event back into base/debug/trace_event

chrome/browser/gpu_process_host_ui_shim.cc

Index: chrome/browser/gpu_process_host_ui_shim.cc
diff --git a/chrome/browser/gpu_process_host_ui_shim.cc b/chrome/browser/gpu_process_host_ui_shim.cc
index 73be07dda11448eb114a4a17a2017fe38de71f14..1ac7fab7eedd1c9a124224e7ede0dcdf1b97497e 100644
--- a/chrome/browser/gpu_process_host_ui_shim.cc
+++ b/chrome/browser/gpu_process_host_ui_shim.cc
@@ -9,6 +9,7 @@
 
 #include "base/command_line.h"
 #include "base/id_map.h"
+#include "base/debug/trace_event.h"
 #include "base/process_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/gpu_data_manager.h"
@@ -20,7 +21,6 @@
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/common/content_switches.h"
 #include "content/common/gpu_messages.h"
-#include "gpu/common/gpu_trace_event.h"
 #include "ui/gfx/gl/gl_context.h"
 
 #if defined(OS_LINUX)
@@ -383,7 +383,7 @@ void GpuProcessHostUIShim::EstablishGpuChannel(
     int renderer_id,
     EstablishChannelCallback *callback) {
   DCHECK(CalledOnValidThread());
-  GPU_TRACE_EVENT0("gpu", "GpuProcessHostUIShim::EstablishGpuChannel");
+  TRACE_EVENT0("gpu", "GpuProcessHostUIShim::EstablishGpuChannel");
   linked_ptr<EstablishChannelCallback> wrapped_callback(callback);
 
   // If GPU features are already blacklisted, no need to establish the channel.