Merge gpu_trace_event back into base/debug/trace_event

webkit/tools/test_shell/test_shell_switches.cc

Index: webkit/tools/test_shell/test_shell_switches.cc
diff --git a/webkit/tools/test_shell/test_shell_switches.cc b/webkit/tools/test_shell/test_shell_switches.cc
index 713aaed7453e9c4abfa6ec6634ecabf551f86ca8..fd88861912763b05ebd989ef2ee4eaba1ff1859b 100644
--- a/webkit/tools/test_shell/test_shell_switches.cc
+++ b/webkit/tools/test_shell/test_shell_switches.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -65,9 +65,6 @@ const char kDebugMemoryInUse[] = "debug-memory-in-use";
 // Enable cookies on the file:// scheme.  --layout-tests also enables this.
 const char kEnableFileCookies[] = "enable-file-cookies";
 
-// Enable tracing events (see base/debug/trace_event.h)
-const char kEnableTracing[] = "enable-tracing";
-
 // Allow scripts to close windows in all cases.
 const char kAllowScriptsToCloseWindows[] = "allow-scripts-to-close-windows";