Roll Chrome into Mojo.

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/debug/trace_event_memory.h"
+#include "base/trace_event/trace_event_memory.h"
 
 #include "base/debug/leak_annotations.h"
-#include "base/debug/trace_event.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 {
 
 // 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;
@@ skipping 405 matching lines @@
   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 base