Merge gpu_trace_event back into base/debug/trace_event

webkit/tools/test_shell/test_shell_main.cc

 // 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 "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/environment.h"
 #include "base/event_recorder.h"
@@ skipping 140 matching lines @@
   // Initialize WebKit for this scope.
   TestShellWebKitInit test_shell_webkit_init(layout_test_mode);
 
   // Suppress abort message in v8 library in debugging mode (but not
   // actually under a debugger).  V8 calls abort() when it hits
   // assertion errors.
   if (suppress_error_dialogs) {
     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
   // playback/record mode.  Generally, in this mode, some functions
   // of client-side randomness are removed.  For example, in
   // this mode Math.random() and Date.getTime() may not return
   // values which vary.
   bool playback_mode =
     parsed_command_line.HasSwitch(test_shell::kPlaybackMode);
   bool record_mode =
@@ skipping 172 matching lines @@
   TestShell::ShutdownTestShell();
   TestShell::CleanupLogging();
 
   // Tear down shared StatsTable; prevents unit_tests from leaking it.
   base::StatsTable::set_current(NULL);
   delete table;
   RemoveSharedMemoryFile(stats_filename);
 
   return 0;
 }