Update from https://crrev.com/306655

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 "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 int kMaxBlockFile = 255;
+const int16 kMaxBlockFile = 255;
 const int kMaxNumBlocks = 4;
-const int kFirstAdditionalBlockFile = 4;
-const int kFirstAdditionalBlockFileV3 = 7;
+const int16 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
 //   1 = rankings block file
@@ skipping 137 matching lines @@
   static const uint32 kFileSelectorOffset = 16;
   static const uint32 kStartBlockMask     = 0x0000FFFF;
   static const uint32 kFileNameMask       = 0x0FFFFFFF;
 
   CacheAddr value_;
 };
 
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_BLOCKFILE_ADDR_H_