diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 04:07:50 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 04:07:50 +0000 |
| commit | 58580359a452cb7c3b9580edc0843c3ab3d158df (patch) | |
| tree | 964dbcc1505f4b9c2bbb5e7a64720861d604c8f3 /chrome_frame/test | |
| parent | 23872906817de5d402b0c2da6d5f7ee6026378e6 (diff) | |
| download | chromium_src-58580359a452cb7c3b9580edc0843c3ab3d158df.zip chromium_src-58580359a452cb7c3b9580edc0843c3ab3d158df.tar.gz chromium_src-58580359a452cb7c3b9580edc0843c3ab3d158df.tar.bz2 | |
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
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/perf/chrome_frame_perftest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
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() { |