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

Unified Diff: content/browser/browser_main.cc

Issue 1386193002: Stop using the TRACE_EVENT_*_ETW macros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main.cc
diff --git a/content/browser/browser_main.cc b/content/browser/browser_main.cc
index 4c114b436133f6823324dc4be39bfe72e79de093..71ee109ce094bc55f51dfc5af54b1f54619b154e 100644
--- a/content/browser/browser_main.cc
+++ b/content/browser/browser_main.cc
@@ -12,7 +12,10 @@ namespace content {
// Main routine for running as the Browser process.
int BrowserMain(const MainFunctionParams& parameters) {
- TRACE_EVENT_BEGIN_ETW("BrowserMain", 0, "");
+ // Don't use the TRACE_EVENT0 macro because the tracing infrastructure doesn't
+ // expect synchronous events around the main loop of a thread.
+ TRACE_EVENT_ASYNC_BEGIN0("startup", "BrowserMain", 0);
+
base::trace_event::TraceLog::GetInstance()->SetProcessName("Browser");
base::trace_event::TraceLog::GetInstance()->SetProcessSortIndex(
kTraceEventBrowserProcessSortIndex);
@@ -27,7 +30,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
main_runner->Shutdown();
- TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
+ TRACE_EVENT_ASYNC_END0("startup", "BrowserMain", 0);
beaudoin 2015/10/06 20:57:38 There's a "return" a couple of lines above that wi
brucedawson 2015/10/07 00:42:56 Seems worth fixing.
fdoray 2015/10/07 15:46:49 Done.
return exit_code;
}
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698