Merge gpu_trace_event back into base/debug/trace_event

chrome/common/sandbox_policy.cc

Index: chrome/common/sandbox_policy.cc
diff --git a/chrome/common/sandbox_policy.cc b/chrome/common/sandbox_policy.cc
index 2e11e0be1c9aa96ebde479a3c3ce480abf1a89bc..7399a519ee509111cb8473656bd9b9f0b01b1fd4 100644
--- a/chrome/common/sandbox_policy.cc
+++ b/chrome/common/sandbox_policy.cc
@@ -601,7 +601,7 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
     return 0;
   }
 
-  TRACE_EVENT_BEGIN("StartProcessWithAccess", 0, type_str);
+  TRACE_EVENT_BEGIN_ETW("StartProcessWithAccess", 0, type_str);
 
   // To decide if the process is going to be sandboxed we have two cases.
   // First case: all process types except the nacl broker, and the plugin
@@ -708,7 +708,7 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
     return 0;
   }
 
-  TRACE_EVENT_BEGIN("StartProcessWithAccess::LAUNCHPROCESS", 0, 0);
+  TRACE_EVENT_BEGIN_ETW("StartProcessWithAccess::LAUNCHPROCESS", 0, 0);
 
   result = g_broker_services->SpawnTarget(
       cmd_line->GetProgram().value().c_str(),
@@ -716,7 +716,7 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
       policy, &target);
   policy->Release();
 
-  TRACE_EVENT_END("StartProcessWithAccess::LAUNCHPROCESS", 0, 0);
+  TRACE_EVENT_END_ETW("StartProcessWithAccess::LAUNCHPROCESS", 0, 0);
 
   if (sandbox::SBOX_ALL_OK != result)
     return 0;