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

base/debug/trace_event.h

-// Copyright (c) 2006-2008 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.
 
 // Trace events to track application performance.  Events consist of a name
 // a type (BEGIN, END or INSTANT), a tracking id and extra string data.
 // In addition, the current process id, thread id, a timestamp down to the
 // microsecond and a file and line number of the calling location.
 //
 // The current implementation logs these events into a log file of the form
 // trace_<pid>.log where it's designed to be post-processed to generate a
 // trace report.  In the future, it may use another mechansim to facilitate
 // real-time analysis.
 
-#ifndef BASE_TRACE_EVENT_H_
-#define BASE_TRACE_EVENT_H_
+#ifndef BASE_DEBUG_TRACE_EVENT_H_
+#define BASE_DEBUG_TRACE_EVENT_H_
 #pragma once
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 // On Windows we always pull in an alternative implementation
 // which logs to Event Tracing for Windows.
 //
 // Note that the Windows implementation is always enabled, irrespective the
 // value of the CHROMIUM_ENABLE_TRACE_EVENT define. The Windows implementation
 // is controlled by Event Tracing for Windows, which will turn tracing on only
 // if there is someone listening for the events it generates.
-#include "base/trace_event_win.h"
+#include "base/debug/trace_event_win.h"
 #else  // defined(OS_WIN)
 
 #include <string>
 
 #include "base/lock.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
 #include "base/time.h"
 #include "base/timer.h"
 
@@ skipping 33 matching lines @@
 #define TRACE_EVENT_INSTANT(name, id, extra) \
   Singleton<base::TraceLog>::get()->Trace(name, \
                                           base::TraceLog::EVENT_INSTANT, \
                                           reinterpret_cast<const void*>(id), \
                                           extra, \
                                           __FILE__, \
                                           __LINE__)
 #endif  // CHROMIUM_ENABLE_TRACE_EVENT
 
 namespace base {
+
 class ProcessMetrics;
-}
 
-namespace base {
+namespace debug {
 
 class TraceLog {
  public:
   enum EventType {
     EVENT_BEGIN,
     EVENT_END,
     EVENT_INSTANT
   };
 
   // Is tracing currently enabled.
@@ skipping 32 matching lines @@
   void Log(const std::string& msg);
 
   bool enabled_;
   FILE* log_file_;
   Lock file_lock_;
   TimeTicks trace_start_time_;
   scoped_ptr<base::ProcessMetrics> process_metrics_;
   RepeatingTimer<TraceLog> timer_;
 };
 
-} // namespace base
+}  // namespace debug
+}  // namespace base
+
 #endif  // defined(OS_WIN)
 
-#endif  // BASE_TRACE_EVENT_H_
+#endif  // BASE_DEBUG_TRACE_EVENT_H_