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

Unified Diff: webkit/tools/test_shell/test_shell_win.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: webkit/tools/test_shell/test_shell_win.cc
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 6b4d00f7eb2f1d536e07d48a3f6965a87fd1c57d..8245b6e95f8a4b6678182cb886b79183be4e3724 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -479,7 +479,7 @@ void TestShell::LoadURLForFrame(const GURL& url,
if (!url.is_valid())
return;
- TRACE_EVENT_BEGIN("url.load", this, url.spec());
+ TRACE_EVENT_BEGIN_ETW("url.load", this, url.spec());
if (IsSVGTestURL(url)) {
SizeToSVG();

Powered by Google App Engine
This is Rietveld 408576698