Switch to standard integer types in base/trace_event/.

base/trace_event/trace_event_argument.cc

 // Copyright (c) 2014 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_argument.h"
 
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/bits.h"
 #include "base/json/json_writer.h"
 #include "base/trace_event/trace_event_memory_overhead.h"
 #include "base/values.h"
 
 namespace base {
 namespace trace_event {
 
@@ skipping 17 matching lines @@
 #define DEBUG_POP_CONTAINER() nesting_stack_.pop_back()
 #else
 #define DCHECK_CURRENT_CONTAINER_IS(x) do {} while (0)
 #define DCHECK_CONTAINER_STACK_DEPTH_EQ(x) do {} while (0)
 #define DEBUG_PUSH_CONTAINER(x) do {} while (0)
 #define DEBUG_POP_CONTAINER() do {} while (0)
 #endif
 
 inline void WriteKeyNameAsRawPtr(Pickle& pickle, const char* ptr) {
   pickle.WriteBytes(&kTypeCStr, 1);
-  pickle.WriteUInt64(static_cast<uint64>(reinterpret_cast<uintptr_t>(ptr)));
+  pickle.WriteUInt64(static_cast<uint64_t>(reinterpret_cast<uintptr_t>(ptr)));
 }
 
 inline void WriteKeyNameWithCopy(Pickle& pickle, base::StringPiece str) {
   pickle.WriteBytes(&kTypeString, 1);
   pickle.WriteString(str);
 }
 
 std::string ReadKeyName(PickleIterator& pickle_iterator) {
   const char* type = nullptr;
   bool res = pickle_iterator.ReadBytes(&type, 1);
   std::string key_name;
   if (res && *type == kTypeCStr) {
-    uint64 ptr_value = 0;
+    uint64_t ptr_value = 0;
     res = pickle_iterator.ReadUInt64(&ptr_value);
     key_name = reinterpret_cast<const char*>(static_cast<uintptr_t>(ptr_value));
   } else if (res && *type == kTypeString) {
     res = pickle_iterator.ReadString(&key_name);
   }
   DCHECK(res);
   return key_name;
 }
 }  // namespace
 
@@ skipping 395 matching lines @@
 
                 /* allocated size */
                 bits::Align(pickle_.GetTotalAllocatedSize(), kPickleHeapAlign),
 
                 /* resident size */
                 bits::Align(pickle_.size(), kPickleHeapAlign));
 }
 
 }  // namespace trace_event
 }  // namespace base