Merge gpu_trace_event back into base/debug/trace_event

chrome/common/sandbox_policy.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/sandbox_policy.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
@@ skipping 583 matching lines @@
     type = ChildProcessInfo::NACL_BROKER_PROCESS;
   } else if (type_str == switches::kGpuProcess) {
     type = ChildProcessInfo::GPU_PROCESS;
   } else if (type_str == switches::kPpapiPluginProcess) {
     type = ChildProcessInfo::PPAPI_PLUGIN_PROCESS;
   } else {
     NOTREACHED();
     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
   // process are sandboxed by default.
   bool in_sandbox =
       (type != ChildProcessInfo::NACL_BROKER_PROCESS) &&
       (type != ChildProcessInfo::PLUGIN_PROCESS);
 
   // Second case: If it is the plugin process then it depends on it being
   // the built-in flash, the user forcing plugins into sandbox or the
@@ skipping 86 matching lines @@
                              exposed_files.value().c_str());
     if (result != sandbox::SBOX_ALL_OK)
       return 0;
   }
 
   if (!AddGenericPolicy(policy)) {
     NOTREACHED();
     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(),
       cmd_line->command_line_string().c_str(),
       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;
 
   ResumeThread(target.hThread);
   CloseHandle(target.hThread);
   process = target.hProcess;
 
   // Help the process a little. It can't start the debugger by itself if
   // the process is in a sandbox.
   if (child_needs_help)
     base::debug::SpawnDebuggerOnProcess(target.dwProcessId);
 
   return process;
 }
 
 }  // namespace sandbox