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

base::debug namespace.

This splits apart debug_util into base/debugger and base/stack_trace
There are still two functions in debug_util that I'm not sure what to do with.
Since this uses the base::debug namespace, I removed the functions in
debugger.h from the static class and just made them free functions in the
namespace.

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3945002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63859 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 11 insertions, 11 deletions

diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 648f3bd5..01051d2 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -12,6 +12,7 @@
 
 #include <vector>
 
+#include "base/debug/trace_event.h"
 #include "base/lock.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
@@ -22,7 +23,6 @@
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "base/trace_event.h"
 #include "grit/webkit_resources.h"
 #include "grit/webkit_strings.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCookie.h"
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 6b5b9c3..94ff251 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -8,7 +8,7 @@
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/command_line.h"
-#include "base/debug_util.h"
+#include "base/debug/debugger.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/icu_util.h"
@@ -330,7 +330,7 @@ void ServeAsynchronousMockedRequests() {
 
 // Wrapper for debug_util
 bool BeingDebugged() {
-  return DebugUtil::BeingDebugged();
+  return base::debug::BeingDebugged();
 }
 
 // Wrappers for MessageLoop
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index e2cd61d..d2b90a7 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -13,7 +13,7 @@
 #include "base/basictypes.h"
 #include "base/data_pack.h"
 #include "base/debug_on_start.h"
-#include "base/debug_util.h"
+#include "base/debug/debugger.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ -403,7 +403,7 @@ void TestShell::TestFinished() {
 
   // check for debugger, just bail if so. We don't want the timeouts hitting
   // when we're trying to track down an issue.
-  if (DebugUtil::BeingDebugged())
+  if (base::debug::BeingDebugged())
     return;
 
   NSThread* currentThread = [NSThread currentThread];
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index a41ce74..8d7d3b9 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -7,6 +7,7 @@
 #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"
@@ -20,7 +21,6 @@
 #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"
@@ -146,7 +146,7 @@ int main(int argc, char* argv[]) {
   }
 
   if (parsed_command_line.HasSwitch(test_shell::kEnableTracing))
-    base::TraceLog::StartTracing();
+    base::debug::TraceLog::StartTracing();
 
   net::HttpCache::Mode cache_mode = net::HttpCache::NORMAL;
 
diff --git a/webkit/tools/test_shell/test_shell_switches.cc b/webkit/tools/test_shell/test_shell_switches.cc
index b66e3a4..b3ed0bc 100644
--- a/webkit/tools/test_shell/test_shell_switches.cc
+++ b/webkit/tools/test_shell/test_shell_switches.cc
@@ -63,7 +63,7 @@ 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/trace_event.h)
+// Enable tracing events (see base/debug/trace_event.h)
 const char kEnableTracing[] = "enable-tracing";
 
 // Allow scripts to close windows in all cases.
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 2bf4ceb..3853755 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -11,6 +11,7 @@
 #include <shlwapi.h>
 
 #include "base/command_line.h"
+#include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/memory_debug.h"
 #include "base/message_loop.h"
@@ -19,7 +20,6 @@
 #include "base/stack_container.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
-#include "base/trace_event.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 8b0b4bc..e6d43f1 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -8,12 +8,12 @@
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
+#include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "base/trace_event.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/native_widget_types.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc
index 150f3bb..64b6a1b 100644
--- a/webkit/tools/test_shell/test_webview_delegate_win.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_win.cc
@@ -12,8 +12,8 @@
 #include <shlobj.h>
 #include <shlwapi.h>
 
+#include "base/debug/trace_event.h"
 #include "base/message_loop.h"
-#include "base/trace_event.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/gdi_util.h"