Revert 84486 - Merge gpu_trace_event back into base/debug/trace_event.Initial land attempt at htt...

chrome_frame/chrome_frame_automation.cc

Index: chrome_frame/chrome_frame_automation.cc
===================================================================
--- chrome_frame/chrome_frame_automation.cc	(revision 84493)
+++ chrome_frame/chrome_frame_automation.cc	(working copy)
@@ -129,7 +129,7 @@
     AutomationProxyCacheEntry* entry,
     std::string channel_id, int launch_timeout)
     : AutomationProxy(launch_timeout, false), proxy_entry_(entry) {
-  TRACE_EVENT_BEGIN_ETW("chromeframe.automationproxy", this, "");
+  TRACE_EVENT_BEGIN("chromeframe.automationproxy", this, "");
 
   InitializeChannel(channel_id, false);
 
@@ -142,7 +142,7 @@
 }
 
 ChromeFrameAutomationProxyImpl::~ChromeFrameAutomationProxyImpl() {
-  TRACE_EVENT_END_ETW("chromeframe.automationproxy", this, "");
+  TRACE_EVENT_END("chromeframe.automationproxy", this, "");
 }
 
 void ChromeFrameAutomationProxyImpl::SendAsAsync(
@@ -354,7 +354,7 @@
                                 AUTOMATION_CREATE_TAB_FAILED + 1);
   }
 
-  TRACE_EVENT_END_ETW("chromeframe.createproxy", this, "");
+  TRACE_EVENT_END("chromeframe.createproxy", this, "");
 
   // Finally set the proxy.
   proxy_.reset(proxy);
@@ -467,7 +467,7 @@
 void ProxyFactory::GetAutomationServer(
     LaunchDelegate* delegate, ChromeFrameLaunchParams* params,
     void** automation_server_id) {
-  TRACE_EVENT_BEGIN_ETW("chromeframe.createproxy", this, "");
+  TRACE_EVENT_BEGIN("chromeframe.createproxy", this, "");
 
   scoped_refptr<AutomationProxyCacheEntry> entry;
   // Find already existing launcher thread for given profile