Switch to standard integer types in base/trace_event/.

base/trace_event/memory_allocator_dump_unittest.cc

 // Copyright 2015 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/memory_allocator_dump.h"
 
+#include <stdint.h>
+
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/memory_allocator_dump_guid.h"
 #include "base/trace_event/memory_dump_provider.h"
 #include "base/trace_event/memory_dump_session_state.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace trace_event {
 
 namespace {
 
 class FakeMemoryAllocatorDumpProvider : public MemoryDumpProvider {
  public:
   bool OnMemoryDump(const MemoryDumpArgs& args,
@@ skipping 50 matching lines @@
                  const std::string& expected_value) {
   std::string attr_str_value;
   auto attr_value = CheckAttribute(dump, name, expected_type, expected_units);
   EXPECT_TRUE(attr_value->GetAsString(&attr_str_value));
   EXPECT_EQ(expected_value, attr_str_value);
 }
 
 void CheckScalar(const MemoryAllocatorDump* dump,
                  const std::string& name,
                  const char* expected_units,
-                 uint64 expected_value) {
+                 uint64_t expected_value) {
   CheckString(dump, name, MemoryAllocatorDump::kTypeScalar, expected_units,
               StringPrintf("%" PRIx64, expected_value));
 }
 
 void CheckScalarF(const MemoryAllocatorDump* dump,
                   const std::string& name,
                   const char* expected_units,
                   double expected_value) {
   auto attr_value = CheckAttribute(dump, name, MemoryAllocatorDump::kTypeScalar,
                                    expected_units);
@@ skipping 80 matching lines @@
   pmd.CreateAllocatorDump("foo_allocator");
   pmd.CreateAllocatorDump("bar_allocator/heap");
   ASSERT_DEATH(pmd.CreateAllocatorDump("foo_allocator"), "");
   ASSERT_DEATH(pmd.CreateAllocatorDump("bar_allocator/heap"), "");
   ASSERT_DEATH(pmd.CreateAllocatorDump(""), "");
 }
 #endif
 
 }  // namespace trace_event
 }  // namespace base