Merge gpu_trace_event back into base/debug/trace_event

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index faa2335c83797c819ce0c052dae91887cea1aa06..0148ef4d07c8f4232eeea4b96916aa6daa8e635f 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -558,7 +558,7 @@ void HandleTestParameters(const CommandLine& command_line) {
 }
 
 void RunUIMessageLoop(BrowserProcess* browser_process) {
-  TRACE_EVENT_BEGIN("BrowserMain:MESSAGE_LOOP", 0, "");
+  TRACE_EVENT_BEGIN_ETW("BrowserMain:MESSAGE_LOOP", 0, "");
 
   // If the UI thread blocks, the whole UI is unresponsive.
   // Do not allow disk IO from the UI thread.
@@ -577,7 +577,7 @@ void RunUIMessageLoop(BrowserProcess* browser_process) {
                                                         true);
 #endif
 
-  TRACE_EVENT_END("BrowserMain:MESSAGE_LOOP", 0, "");
+  TRACE_EVENT_END_ETW("BrowserMain:MESSAGE_LOOP", 0, "");
 }
 
 void AddFirstRunNewTabs(BrowserInit* browser_init,
@@ -1097,7 +1097,7 @@ bool IsMetricsReportingEnabled(const PrefService* local_state) {
 
 // Main routine for running as the Browser process.
 int BrowserMain(const MainFunctionParams& parameters) {
-  TRACE_EVENT_BEGIN("BrowserMain", 0, "");
+  TRACE_EVENT_BEGIN_ETW("BrowserMain", 0, "");
 
   // If we're running tests (ui_task is non-null).
   if (parameters.ui_task)
@@ -1867,6 +1867,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
                                                         false);
   chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
 #endif
-  TRACE_EVENT_END("BrowserMain", 0, 0);
+  TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
   return result_code;
 }