Switch to standard integer types in net/.

net/disk_cache/simple/simple_entry_format_history.h

Index: net/disk_cache/simple/simple_entry_format_history.h
diff --git a/net/disk_cache/simple/simple_entry_format_history.h b/net/disk_cache/simple/simple_entry_format_history.h
index 89d378b620bfaac6c527cd010cfe13c1a34d461d..3bcb8b449170be2aca36d15d40a95af418615149 100644
--- a/net/disk_cache/simple/simple_entry_format_history.h
+++ b/net/disk_cache/simple/simple_entry_format_history.h
@@ -7,15 +7,14 @@
 
 #include <stdint.h>
 
-#include "base/basictypes.h"
 #include "net/base/net_export.h"
 
 namespace disk_cache {
 
 namespace simplecache_v5 {
 
-const uint64 kSimpleInitialMagicNumber = UINT64_C(0xfcfb6d1ba7725c30);
-const uint64 kSimpleFinalMagicNumber = UINT64_C(0xf4fa6f45970d41d8);
+const uint64_t kSimpleInitialMagicNumber = UINT64_C(0xfcfb6d1ba7725c30);
+const uint64_t kSimpleFinalMagicNumber = UINT64_C(0xf4fa6f45970d41d8);
 
 // A file containing stream 0 and stream 1 in the Simple cache consists of:
 //   - a SimpleFileHeader.
@@ -36,10 +35,10 @@ static const int kSimpleEntryStreamCount = 3;
 struct NET_EXPORT_PRIVATE SimpleFileHeader {
   SimpleFileHeader();
 
-  uint64 initial_magic_number;
-  uint32 version;
-  uint32 key_length;
-  uint32 key_hash;
+  uint64_t initial_magic_number;
+  uint32_t version;
+  uint32_t key_length;
+  uint32_t key_hash;
 };
 
 struct NET_EXPORT_PRIVATE SimpleFileEOF {
@@ -49,11 +48,11 @@ struct NET_EXPORT_PRIVATE SimpleFileEOF {
 
   SimpleFileEOF();
 
-  uint64 final_magic_number;
-  uint32 flags;
-  uint32 data_crc32;
+  uint64_t final_magic_number;
+  uint32_t flags;
+  uint32_t data_crc32;
   // |stream_size| is only used in the EOF record for stream 0.
-  uint32 stream_size;
+  uint32_t stream_size;
 };
 
 }  // namespace simplecache_v5