Switch to standard integer types in base/trace_event/.

base/trace_event/process_memory_maps_dump_provider_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/process_memory_maps_dump_provider.h"
 
+#include <stdint.h>
+
 #include "base/files/file_util.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "base/trace_event/process_memory_maps.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace trace_event {
 
 namespace {
@@ skipping 92 matching lines @@
   file.reset(temp_file);
   ASSERT_TRUE(temp_file);
 
   ASSERT_TRUE(base::WriteFileDescriptor(fileno(temp_file), smaps_string,
                                         strlen(smaps_string)));
 }
 
 }  // namespace
 
 TEST(ProcessMemoryMapsDumpProviderTest, ParseProcSmaps) {
-  const uint32 kProtR = ProcessMemoryMaps::VMRegion::kProtectionFlagsRead;
-  const uint32 kProtW = ProcessMemoryMaps::VMRegion::kProtectionFlagsWrite;
-  const uint32 kProtX = ProcessMemoryMaps::VMRegion::kProtectionFlagsExec;
+  const uint32_t kProtR = ProcessMemoryMaps::VMRegion::kProtectionFlagsRead;
+  const uint32_t kProtW = ProcessMemoryMaps::VMRegion::kProtectionFlagsWrite;
+  const uint32_t kProtX = ProcessMemoryMaps::VMRegion::kProtectionFlagsExec;
   const MemoryDumpArgs dump_args = {MemoryDumpLevelOfDetail::DETAILED};
 
   auto pmmdp = ProcessMemoryMapsDumpProvider::GetInstance();
 
   // Emulate an empty /proc/self/smaps.
   ProcessMemoryDump pmd_invalid(nullptr /* session_state */);
   ScopedFILE empty_file(OpenFile(FilePath("/dev/null"), "r"));
   ASSERT_TRUE(empty_file.get());
   ProcessMemoryMapsDumpProvider::proc_smaps_for_testing = empty_file.get();
   pmmdp->OnMemoryDump(dump_args, &pmd_invalid);
@@ skipping 47 matching lines @@
   EXPECT_EQ(32 * 1024UL, regions_2[0].byte_stats_proportional_resident);
   EXPECT_EQ(16 * 1024UL, regions_2[0].byte_stats_shared_clean_resident);
   EXPECT_EQ(12 * 1024UL, regions_2[0].byte_stats_shared_dirty_resident);
   EXPECT_EQ(8 * 1024UL, regions_2[0].byte_stats_private_clean_resident);
   EXPECT_EQ(4 * 1024UL, regions_2[0].byte_stats_private_dirty_resident);
   EXPECT_EQ(0 * 1024UL, regions_2[0].byte_stats_swapped);
 }
 
 }  // namespace trace_event
 }  // namespace base