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

6 files changed, 12 insertions, 11 deletions

diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index 141a544..004b9d5 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -18,6 +18,7 @@
 #include <wininet.h>
 
 #include "base/command_line.h"
+#include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ -26,7 +27,6 @@
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "base/thread_local.h"
-#include "base/trace_event.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_variant.h"
 #include "grit/generated_resources.h"
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 9a99434..af2d00d 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -337,6 +337,7 @@
       'msvs_guid': '3767888B-76ED-4D2A-B1F5-263CC56A12AA',
       'type': 'executable',
       'dependencies': [
+        '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc
index 023bc7d..5d7904a 100644
--- a/chrome_frame/chrome_frame_activex.cc
+++ b/chrome_frame/chrome_frame_activex.cc
@@ -11,6 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
+#include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ -19,7 +20,6 @@
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "base/trace_event.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_variant.h"
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 28362e5..9f62523 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -8,7 +8,7 @@
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
-#include "base/trace_event.h"
+#include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/lock.h"
diff --git a/chrome_frame/protocol_sink_wrap.h b/chrome_frame/protocol_sink_wrap.h
index 0d837a0aa..24810aa 100644
--- a/chrome_frame/protocol_sink_wrap.h
+++ b/chrome_frame/protocol_sink_wrap.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index e026d48..d0612ec 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.cc
+++ b/chrome_frame/test/perf/chrome_frame_perftest.cc
@@ -21,7 +21,7 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
-#include "base/trace_event_win.h"
+#include "base/debug/trace_event_win.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_bstr.h"
@@ -1159,19 +1159,19 @@ class EtwConsumer : public EtwTraceConsumerBase<EtwConsumer> {
 
   static void ProcessEvent(EVENT_TRACE* event) {
     DCHECK(delegate_);
-    if (event->Header.Guid != base::kTraceEventClass32)
+    if (event->Header.Guid != base::debug::kTraceEventClass32)
       return;
     if (event->Header.Class.Version != 0)
       return;
 
     switch (event->Header.Class.Type) {
-      case base::kTraceEventTypeBegin:
+      case base::debug::kTraceEventTypeBegin:
         delegate_->OnTraceEventBegin(event);
         break;
-      case base::kTraceEventTypeEnd:
+      case base::debug::kTraceEventTypeEnd:
         delegate_->OnTraceEventEnd(event);
         break;
-      case base::kTraceEventTypeInstant:
+      case base::debug::kTraceEventTypeInstant:
         delegate_->OnTraceEventInstant(event);
         break;
       default:
@@ -1203,9 +1203,9 @@ class EtwPerfSession {
     ASSERT_HRESULT_SUCCEEDED(controller_.StartFileSession(L"cf_perf",
         etl_log_file_.value().c_str(), false));
     ASSERT_HRESULT_SUCCEEDED(controller_.EnableProvider(
-        base::kChromeTraceProviderName,
+        base::debug::kChromeTraceProviderName,
         TRACE_LEVEL_INFORMATION,
-        ~(base::CAPTURE_STACK_TRACE)));
+        ~(base::debug::CAPTURE_STACK_TRACE)));
   }
 
   HRESULT Stop() {