Move debug-related stuff from base to the base/debug directory and use the...

webkit/tools/test_shell/test_shell_main.cc

 // Copyright (c) 2010 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 "app/app_switches.h"
 #include "app/gfx/gl/gl_implementation.h"
 #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"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/icu_util.h"
 #include "base/memory_debug.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_table.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/sys_info.h"
-#include "base/trace_event.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/net_module.h"
 #include "net/base/net_util.h"
 #include "net/http/http_cache.h"
 #include "net/test/test_server.h"
 #include "net/url_request/url_request_context.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h"
 #include "webkit/glue/webkit_glue.h"
@@ skipping 105 matching lines @@
   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::TraceLog::StartTracing();
+    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);
@@ skipping 237 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;
 }