Merge gpu_trace_event back into base/debug/trace_event

webkit/tools/test_shell/test_shell_switches.cc

-// 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.
 
 #include "webkit/tools/test_shell/test_shell_switches.h"
 
 namespace test_shell {
 
 // Suppresses all error dialogs when present.
 const char kNoErrorDialogs[]                = "noerrdialogs";
 
@@ skipping 46 matching lines @@
 // Use a specified cache directory.
 const char kCacheDir[] = "cache-dir";
 
 // When being run through a memory profiler, trigger memory in use dumps at
 // startup and just prior to shutdown.
 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";
 
 // Test the system dependencies (themes, fonts, ...). When this flag is
 // specified, the test shell will exit immediately with either 0 (success) or
 // 1 (failure). Combining with other flags has no effect.
 const char kCheckLayoutTestSystemDeps[] = "check-layout-test-sys-deps";
 
 // If set, we are running under GDB so allow a certain class of errors
 // to happen even if in layout test mode.
 const char kGDB[] = "gdb";
 
 // Make functions of the Profiler class available in javascript
 const char kProfiler[] = "profiler";
 
 // Make functions of the HeapProfiler class available in javascript
 const char kHeapProfiler[] = "heap-profiler";
 
 const char kAllowExternalPages[] = "allow-external-pages";
 
 const char kEnableAccel2DCanvas[] = "enable-accelerated-2d-canvas";
 
 const char kEnableAccelCompositing[] = "enable-accelerated-compositing";
 
 }  // namespace test_shell