| Index: base/trace_event/memory_allocator_dump_guid.h
|
| diff --git a/base/trace_event/memory_allocator_dump_guid.h b/base/trace_event/memory_allocator_dump_guid.h
|
| index 634ca8133b53200ecc7bc9cfa9300642ed8ecebc..b6472c66129bda37c95817984c796e6a6be1dfff 100644
|
| --- a/base/trace_event/memory_allocator_dump_guid.h
|
| +++ b/base/trace_event/memory_allocator_dump_guid.h
|
| @@ -5,10 +5,11 @@
|
| #ifndef BASE_TRACE_EVENT_MEMORY_ALLOCATOR_DUMP_GUID_H_
|
| #define BASE_TRACE_EVENT_MEMORY_ALLOCATOR_DUMP_GUID_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
|
|
| #include "base/base_export.h"
|
| -#include "base/basictypes.h"
|
|
|
| namespace base {
|
| namespace trace_event {
|
| @@ -16,14 +17,14 @@ namespace trace_event {
|
| class BASE_EXPORT MemoryAllocatorDumpGuid {
|
| public:
|
| MemoryAllocatorDumpGuid();
|
| - explicit MemoryAllocatorDumpGuid(uint64 guid);
|
| + explicit MemoryAllocatorDumpGuid(uint64_t guid);
|
|
|
| // Utility ctor to hash a GUID if the caller prefers a string. The caller
|
| // still has to ensure that |guid_str| is unique, per snapshot, within the
|
| // global scope of all the traced processes.
|
| explicit MemoryAllocatorDumpGuid(const std::string& guid_str);
|
|
|
| - uint64 ToUint64() const { return guid_; }
|
| + uint64_t ToUint64() const { return guid_; }
|
|
|
| // Returns a (hex-encoded) string representation of the guid.
|
| std::string ToString() const;
|
| @@ -39,7 +40,7 @@ class BASE_EXPORT MemoryAllocatorDumpGuid {
|
| }
|
|
|
| private:
|
| - uint64 guid_;
|
| + uint64_t guid_;
|
|
|
| // Deliberately copy-able.
|
| };
|
|
|