Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(416)

Unified Diff: chrome/common/sandbox_policy.cc

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: shared dll build, phishing test shutdown crashes, tsan warnings; merge 84612 Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/sandbox_policy.cc
diff --git a/chrome/common/sandbox_policy.cc b/chrome/common/sandbox_policy.cc
index 302652271a090c9943588a3c3ab5f57e11d7b9a2..97142aa741091c40c4868d9e8cbd9818e489b4cf 100644
--- a/chrome/common/sandbox_policy.cc
+++ b/chrome/common/sandbox_policy.cc
@@ -612,7 +612,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
@@ -721,7 +721,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(),
@@ -729,7 +729,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;

Powered by Google App Engine
This is Rietveld 408576698