Merge gpu_trace_event back into base/debug/trace_event

chrome/browser/automation/automation_provider_win.cc

Index: chrome/browser/automation/automation_provider_win.cc
diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc
index bb2886470c23cfcee2cceb0d3a39d8fe24b1a2ac..80a7595065451086c2dfa9aead3a9edc53dd7a50 100644
--- a/chrome/browser/automation/automation_provider_win.cc
+++ b/chrome/browser/automation/automation_provider_win.cc
@@ -231,7 +231,7 @@ void AutomationProvider::CreateExternalTab(
     const ExternalTabSettings& settings,
     gfx::NativeWindow* tab_container_window, gfx::NativeWindow* tab_window,
     int* tab_handle, int* session_id) {
-  TRACE_EVENT_BEGIN("AutomationProvider::CreateExternalTab", 0, "");
+  TRACE_EVENT_BEGIN_ETW("AutomationProvider::CreateExternalTab", 0, "");
 
   *tab_handle = 0;
   *tab_container_window = NULL;
@@ -261,7 +261,7 @@ void AutomationProvider::CreateExternalTab(
     external_tab_container->Uninitialize();
   }
 
-  TRACE_EVENT_END("AutomationProvider::CreateExternalTab", 0, "");
+  TRACE_EVENT_END_ETW("AutomationProvider::CreateExternalTab", 0, "");
 }
 
 bool AutomationProvider::AddExternalTab(ExternalTabContainer* external_tab) {
@@ -371,7 +371,7 @@ void AutomationProvider::ConnectExternalTab(
     gfx::NativeWindow* tab_window,
     int* tab_handle,
     int* session_id) {
-  TRACE_EVENT_BEGIN("AutomationProvider::ConnectExternalTab", 0, "");
+  TRACE_EVENT_BEGIN_ETW("AutomationProvider::ConnectExternalTab", 0, "");
 
   *tab_handle = 0;
   *tab_container_window = NULL;
@@ -398,7 +398,7 @@ void AutomationProvider::ConnectExternalTab(
     external_tab_container->Uninitialize();
   }
 
-  TRACE_EVENT_END("AutomationProvider::ConnectExternalTab", 0, "");
+  TRACE_EVENT_END_ETW("AutomationProvider::ConnectExternalTab", 0, "");
 }
 
 void AutomationProvider::OnBrowserMoved(int tab_handle) {