Update from https://crrev.com/306655

net/disk_cache/blockfile/block_bitmaps_v3.cc

 // 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.
 
 #include "net/disk_cache/blockfile/block_bitmaps_v3.h"
 
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "net/disk_cache/blockfile/disk_format_base.h"
 #include "net/disk_cache/blockfile/trace.h"
@@ skipping 53 matching lines @@
                                       address.num_blocks());
 }
 
 void BlockBitmaps::Clear() {
   bitmaps_.clear();
 }
 
 void BlockBitmaps::ReportStats() {
   int used_blocks[kFirstAdditionalBlockFile];
   int load[kFirstAdditionalBlockFile];
-  for (int i = 0; i < kFirstAdditionalBlockFile; i++) {
+  for (int16 i = 0; i < kFirstAdditionalBlockFile; i++) {
     GetFileStats(i, &used_blocks[i], &load[i]);
   }
   UMA_HISTOGRAM_COUNTS("DiskCache.Blocks_0", used_blocks[0]);
   UMA_HISTOGRAM_COUNTS("DiskCache.Blocks_1", used_blocks[1]);
   UMA_HISTOGRAM_COUNTS("DiskCache.Blocks_2", used_blocks[2]);
   UMA_HISTOGRAM_COUNTS("DiskCache.Blocks_3", used_blocks[3]);
 
   UMA_HISTOGRAM_ENUMERATION("DiskCache.BlockLoad_0", load[0], 101);
   UMA_HISTOGRAM_ENUMERATION("DiskCache.BlockLoad_1", load[1], 101);
   UMA_HISTOGRAM_ENUMERATION("DiskCache.BlockLoad_2", load[2], 101);
@@ skipping 12 matching lines @@
     return false;
 
   bool rv = bitmaps_[header_num].UsedMapBlock(address.start_block(),
                                               address.num_blocks());
   DCHECK(rv);
   return rv;
 #endif
 }
 
 int BlockBitmaps::GetHeaderNumber(Addr address) {
-  DCHECK_GE(bitmaps_.size(), static_cast<size_t>(kFirstAdditionalBlockFileV3));
+  DCHECK_GE(bitmaps_.size(), kFirstAdditionalBlockFileV3);
   DCHECK(address.is_block_file() || !address.is_initialized());
   if (!address.is_initialized())
     return -1;
 
   int file_index = address.FileNumber();
   if (static_cast<unsigned int>(file_index) >= bitmaps_.size())
     return -1;
 
   return file_index;
 }
@@ skipping 52 matching lines @@
     *used_count += used;
 
     index = bitmaps_[index].NextFileId();
   } while (index);
 
   if (max_blocks)
     *load = *used_count * 100 / max_blocks;
 }
 
 }  // namespace disk_cache