Merge gpu_trace_event back into base/debug/trace_event

webkit/glue/webkitclient_impl.cc

Index: webkit/glue/webkitclient_impl.cc
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 4e2b10ad302349044871920746604f44168aa7e5..3968dc6a2494ddcb4e10e84ab20e38be2fccbc84 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -25,7 +25,6 @@
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "gpu/common/gpu_trace_event.h"
 #include "grit/webkit_chromium_resources.h"
 #include "grit/webkit_resources.h"
 #include "grit/webkit_strings.h"
@@ -284,16 +283,12 @@ void WebKitClientImpl::histogramEnumeration(
 
 void WebKitClientImpl::traceEventBegin(const char* name, void* id,
                                        const char* extra) {
-  TRACE_EVENT_BEGIN(name, id, extra);
-  GPU_TRACE_EVENT_BEGIN2("webkit", name,
-                         "id", StringPrintf("%p", id).c_str(),
-                         "extra", extra ? extra : "");
+  TRACE_EVENT_BEGIN_ETW(name, id, extra);
 }
 
 void WebKitClientImpl::traceEventEnd(const char* name, void* id,
                                      const char* extra) {
-  TRACE_EVENT_END(name, id, extra);
-  GPU_TRACE_EVENT_END0("webkit", name);
+  TRACE_EVENT_END_ETW(name, id, extra);
 }
 
 namespace {