Reland of Move tracing namespace from base::debug to base::trace_event.

base/trace_event/trace_event_memory.cc

 // Copyright 2013 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 "base/trace_event/trace_event_memory.h"
 
 #include "base/debug/leak_annotations.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_local_storage.h"
 #include "base/trace_event/trace_event.h"
 
 namespace base {
-namespace debug {
+namespace trace_event {
 
 namespace {
 
 // Maximum number of nested TRACE_EVENT scopes to record. Must be less than
 // or equal to HeapProfileTable::kMaxStackDepth / 2 because we record two
 // entries on the pseudo-stack per scope.
 const size_t kMaxScopeDepth = 16;
 
 /////////////////////////////////////////////////////////////////////////////
 // Holds a memory dump until the tracing system needs to serialize it.
-class MemoryDumpHolder : public base::debug::ConvertableToTraceFormat {
+class MemoryDumpHolder : public base::trace_event::ConvertableToTraceFormat {
  public:
   // Takes ownership of dump, which must be a JSON string, allocated with
   // malloc() and NULL terminated.
   explicit MemoryDumpHolder(char* dump) : dump_(dump) {}
 
-  // base::debug::ConvertableToTraceFormat overrides:
+  // base::trace_event::ConvertableToTraceFormat overrides:
   void AppendAsTraceFormat(std::string* out) const override {
     AppendHeapProfileAsTraceFormat(dump_, out);
   }
 
  private:
   ~MemoryDumpHolder() override { free(dump_); }
 
   char* dump_;
 
   DISALLOW_COPY_AND_ASSIGN(MemoryDumpHolder);
@@ skipping 112 matching lines @@
   // Watch for the tracing system being enabled.
   TraceLog::GetInstance()->AddEnabledStateObserver(this);
 }
 
 TraceMemoryController::~TraceMemoryController() {
   if (dump_timer_.IsRunning())
     StopProfiling();
   TraceLog::GetInstance()->RemoveEnabledStateObserver(this);
 }
 
-  // base::debug::TraceLog::EnabledStateChangedObserver overrides:
+// base::trace_event::TraceLog::EnabledStateChangedObserver overrides:
 void TraceMemoryController::OnTraceLogEnabled() {
   // Check to see if tracing is enabled for the memory category.
   bool enabled;
   TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("memory"),
                                      &enabled);
   if (!enabled)
     return;
   DVLOG(1) << "OnTraceLogEnabled";
   message_loop_proxy_->PostTask(
       FROM_HERE,
@@ skipping 250 matching lines @@
 const char* StringFromHexAddress(const std::string& hex_address) {
   uint64 address = 0;
   if (!base::HexStringToUInt64(hex_address, &address))
     return "error";
   if (!address)
     return "null";
   // Note that this cast handles 64-bit to 32-bit conversion if necessary.
   return reinterpret_cast<const char*>(address);
 }
 
-}  // namespace debug
+}  // namespace trace_event
 }  // namespace base