Roll Chrome into Mojo.

base/trace_event/trace_event_memory_unittest.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 <sstream>
 #include <string>
 
-#include "base/debug/trace_event_impl.h"
 #include "base/message_loop/message_loop.h"
+#include "base/trace_event/trace_event_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
 #endif
 
 namespace base {
 namespace debug {
 
 // Tests for the trace event memory tracking system. Exists as a class so it
@@ skipping 209 matching lines @@
   EXPECT_STREQ("null", StringFromHexAddress("0x0"));
   EXPECT_STREQ("error", StringFromHexAddress("not an address"));
   const char kHello[] = "hello";
   std::ostringstream hex_address;
   hex_address << &kHello;
   EXPECT_STREQ(kHello, StringFromHexAddress(hex_address.str()));
 }
 
 }  // namespace debug
 }  // namespace base