Switch to standard integer types in net/.

net/disk_cache/blockfile/storage_block.h

 // Copyright (c) 2012 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.
 
 // See net/disk_cache/disk_cache.h for the public interface.
 
 #ifndef NET_DISK_CACHE_BLOCKFILE_STORAGE_BLOCK_H_
 #define NET_DISK_CACHE_BLOCKFILE_STORAGE_BLOCK_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "net/disk_cache/blockfile/addr.h"
 #include "net/disk_cache/blockfile/mapped_file.h"
 
 namespace disk_cache {
 
 // This class encapsulates common behavior of a single "block" of data that is
 // stored on a block-file. It implements the FileBlock interface, so it can be
 // serialized directly to the backing file.
 // This object provides a memory buffer for the related data, and it can be used
 // to actually share that memory with another instance of the class.
@@ skipping 53 matching lines @@
 
   // Loads and store the data.
   bool Load();
   bool Store();
   bool Load(FileIOCallback* callback, bool* completed);
   bool Store(FileIOCallback* callback, bool* completed);
 
  private:
   void AllocateData();
   void DeleteData();
-  uint32 CalculateHash() const;
+  uint32_t CalculateHash() const;
 
   T* data_;
   MappedFile* file_;
   Addr address_;
   bool modified_;
   bool own_data_;  // Is data_ owned by this object or shared with someone else.
   bool extended_;  // Used to store an entry of more than one block.
 
   DISALLOW_COPY_AND_ASSIGN(StorageBlock);
 };
 
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_BLOCKFILE_STORAGE_BLOCK_H_