webkit/tools/test_shell/test_shell_main.cc - Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/tools/test_shell/test_shell_main.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:

Index: webkit/tools/test_shell/test_shell_main.cc

diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc

index 49ed62be169183a3906bdbab2064ae327cac2e22..e107b6aeb6debc13c1217f3509c3187f24429986 100644

--- a/webkit/tools/test_shell/test_shell_main.cc

+++ b/webkit/tools/test_shell/test_shell_main.cc

@@ -158,9 +158,6 @@ int main(int argc, char* argv[]) {

platform.SuppressErrorReporting();

}

- if (parsed_command_line.HasSwitch(test_shell::kEnableTracing))

- base::debug::TraceLog::StartTracing();

net::HttpCache::Mode cache_mode = net::HttpCache::NORMAL;

// This is a special mode where JS helps the browser implement