Remove kint16max.

net/disk_cache/blockfile/addr.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.
 
 // This is an internal class that handles the address of a cache record.
 // See net/disk_cache/disk_cache.h for the public interface of the cache.
 
 #ifndef NET_DISK_CACHE_BLOCKFILE_ADDR_H_
 #define NET_DISK_CACHE_BLOCKFILE_ADDR_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "net/base/net_export.h"
 #include "net/disk_cache/blockfile/disk_format_base.h"
 
 namespace disk_cache {
 
 enum FileType {
   EXTERNAL = 0,
   RANKINGS = 1,
   BLOCK_256 = 2,
   BLOCK_1K = 3,
   BLOCK_4K = 4,
   BLOCK_FILES = 5,
   BLOCK_ENTRIES = 6,
   BLOCK_EVICTED = 7
 };
 
 const int kMaxBlockSize = 4096 * 4;
-const int16 kMaxBlockFile = 255;
+const int16_t kMaxBlockFile = 255;
 const int kMaxNumBlocks = 4;
-const int16 kFirstAdditionalBlockFile = 4;
+const int16_t kFirstAdditionalBlockFile = 4;
 const size_t kFirstAdditionalBlockFileV3 = 7;
 
 // Defines a storage address for a cache record
 //
 // Header:
 //   1000 0000 0000 0000 0000 0000 0000 0000 : initialized bit
 //   0111 0000 0000 0000 0000 0000 0000 0000 : file type
 //
 // File type values:
 //   0 = separate file on disk
@@ skipping 117 matching lines @@
   }
 
   // Returns true if this address looks like a valid one.
   bool SanityCheckV2() const;
   bool SanityCheckV3() const;
   bool SanityCheckForEntryV2() const;
   bool SanityCheckForEntryV3() const;
   bool SanityCheckForRankings() const;
 
  private:
-  uint32 reserved_bits() const {
-    return value_ & kReservedBitsMask;
-  }
+  uint32_t reserved_bits() const { return value_ & kReservedBitsMask; }
 
-  static const uint32 kInitializedMask    = 0x80000000;
-  static const uint32 kFileTypeMask       = 0x70000000;
-  static const uint32 kFileTypeOffset     = 28;
-  static const uint32 kReservedBitsMask   = 0x0c000000;
-  static const uint32 kNumBlocksMask      = 0x03000000;
-  static const uint32 kNumBlocksOffset    = 24;
-  static const uint32 kFileSelectorMask   = 0x00ff0000;
-  static const uint32 kFileSelectorOffset = 16;
-  static const uint32 kStartBlockMask     = 0x0000FFFF;
-  static const uint32 kFileNameMask       = 0x0FFFFFFF;
+  static const uint32_t kInitializedMask = 0x80000000;
+  static const uint32_t kFileTypeMask = 0x70000000;
+  static const uint32_t kFileTypeOffset = 28;
+  static const uint32_t kReservedBitsMask = 0x0c000000;
+  static const uint32_t kNumBlocksMask = 0x03000000;
+  static const uint32_t kNumBlocksOffset = 24;
+  static const uint32_t kFileSelectorMask = 0x00ff0000;
+  static const uint32_t kFileSelectorOffset = 16;
+  static const uint32_t kStartBlockMask = 0x0000FFFF;
+  static const uint32_t kFileNameMask = 0x0FFFFFFF;
 
   CacheAddr value_;
 };
 
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_BLOCKFILE_ADDR_H_