Merge gpu_trace_event back into base/debug/trace_event

chrome/browser/automation/automation_provider.cc

Index: chrome/browser/automation/automation_provider.cc
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 969c43b203d09e1990dde7246d19a8e791a4eed5..33ce0f2822a8cb3186b93bcc7b71597f777f3e27 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -112,7 +112,7 @@ AutomationProvider::AutomationProvider(Profile* profile)
       is_connected_(false),
       initial_tab_loads_complete_(false),
       network_library_initialized_(true) {
-  TRACE_EVENT_BEGIN("AutomationProvider::AutomationProvider", 0, "");
+  TRACE_EVENT_BEGIN_ETW("AutomationProvider::AutomationProvider", 0, "");
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ -128,7 +128,7 @@ AutomationProvider::AutomationProvider(Profile* profile)
       new ExtensionTestResultNotificationObserver(this));
   g_browser_process->AddRefModule();
 
-  TRACE_EVENT_END("AutomationProvider::AutomationProvider", 0, "");
+  TRACE_EVENT_END_ETW("AutomationProvider::AutomationProvider", 0, "");
 }
 
 AutomationProvider::~AutomationProvider() {
@@ -139,7 +139,7 @@ AutomationProvider::~AutomationProvider() {
 }
 
 bool AutomationProvider::InitializeChannel(const std::string& channel_id) {
-  TRACE_EVENT_BEGIN("AutomationProvider::InitializeChannel", 0, "");
+  TRACE_EVENT_BEGIN_ETW("AutomationProvider::InitializeChannel", 0, "");
 
   channel_id_ = channel_id;
   std::string effective_channel_id = channel_id;
@@ -179,7 +179,7 @@ bool AutomationProvider::InitializeChannel(const std::string& channel_id) {
     delete observer;
 #endif
 
-  TRACE_EVENT_END("AutomationProvider::InitializeChannel", 0, "");
+  TRACE_EVENT_END_ETW("AutomationProvider::InitializeChannel", 0, "");
 
   return true;
 }