| Index: content/common/sandbox_win.cc
|
| diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc
|
| index 5860239b4cf0b5bbfd4444569cd487fc537220ee..94292eb2149a745b26acd38a2ebbec38c77ad0e3 100644
|
| --- a/content/common/sandbox_win.cc
|
| +++ b/content/common/sandbox_win.cc
|
| @@ -653,7 +653,7 @@ base::Process StartSandboxedProcess(
|
| *base::CommandLine::ForCurrentProcess();
|
| std::string type_str = cmd_line->GetSwitchValueASCII(switches::kProcessType);
|
|
|
| - TRACE_EVENT_BEGIN_ETW("StartProcessWithAccess", 0, type_str);
|
| + TRACE_EVENT1("startup", "StartProcessWithAccess", "type", type_str);
|
|
|
| // Propagate the --allow-no-job flag if present.
|
| if (browser_command_line.HasSwitch(switches::kAllowNoSandboxJob) &&
|
| @@ -795,17 +795,16 @@ base::Process StartSandboxedProcess(
|
| return base::Process();
|
| }
|
|
|
| - TRACE_EVENT_BEGIN_ETW("StartProcessWithAccess::LAUNCHPROCESS", 0, 0);
|
| + TRACE_EVENT_BEGIN0("startup", "StartProcessWithAccess::LAUNCHPROCESS");
|
|
|
| PROCESS_INFORMATION temp_process_info = {};
|
| result = g_broker_services->SpawnTarget(
|
| - cmd_line->GetProgram().value().c_str(),
|
| - cmd_line->GetCommandLineString().c_str(),
|
| - policy, &temp_process_info);
|
| + cmd_line->GetProgram().value().c_str(),
|
| + cmd_line->GetCommandLineString().c_str(), policy, &temp_process_info);
|
| DWORD last_error = ::GetLastError();
|
| base::win::ScopedProcessInformation target(temp_process_info);
|
|
|
| - TRACE_EVENT_END_ETW("StartProcessWithAccess::LAUNCHPROCESS", 0, 0);
|
| + TRACE_EVENT_END0("startup", "StartProcessWithAccess::LAUNCHPROCESS");
|
|
|
| if (sandbox::SBOX_ALL_OK != result) {
|
| if (result == sandbox::SBOX_ERROR_GENERIC)
|
| @@ -831,7 +830,6 @@ base::Process StartSandboxedProcess(
|
| delegate->PostSpawnTarget(target.process_handle());
|
|
|
| CHECK(ResumeThread(target.thread_handle()) != -1);
|
| - TRACE_EVENT_END_ETW("StartProcessWithAccess", 0, type_str);
|
| return base::Process(target.TakeProcessHandle());
|
| }
|
|
|
|
|