Update from https://crrev.com/306655

third_party/zlib/google/zip_reader.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 "third_party/zlib/google/zip_reader.h"
 
 #include "base/bind.h"
 #include "base/files/file.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 346 matching lines @@
 
   const int open_result = unzOpenCurrentFile(zip_file_);
   if (open_result != UNZ_OK)
     return false;
 
   // The original_size() is the best hint for the real size, so it saves
   // doing reallocations for the common case when the uncompressed size is
   // correct. However, we need to assume that the uncompressed size could be
   // incorrect therefore this function needs to read as much data as possible.
   std::string contents;
-  contents.reserve(std::min<size_t>(
-      max_read_bytes, current_entry_info()->original_size()));
+  contents.reserve(static_cast<size_t>(std::min(
+      static_cast<int64>(max_read_bytes),
+      current_entry_info()->original_size())));
 
   bool success = true;  // This becomes false when something bad happens.
   char buf[internal::kZipBufSize];
   while (true) {
     const int num_bytes_read = unzReadCurrentFile(zip_file_, buf,
                                                   internal::kZipBufSize);
     if (num_bytes_read == 0) {
       // Reached the end of the file.
       break;
     } else if (num_bytes_read < 0) {
@@ skipping 76 matching lines @@
                    success_callback,
                    failure_callback,
                    progress_callback,
                    current_progress));
 
   }
 }
 
 
 }  // namespace zip