Update from https://crrev.com/306655

net/url_request/url_request_simple_job.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/url_request/url_request_simple_job.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 35 matching lines @@
 URLRequestSimpleJob::~URLRequestSimpleJob() {}
 
 bool URLRequestSimpleJob::ReadRawData(IOBuffer* buf, int buf_size,
                                       int* bytes_read) {
   // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422489 URLRequestSimpleJob::ReadRawData"));
 
   DCHECK(bytes_read);
-  int remaining = byte_range_.last_byte_position() - data_offset_ + 1;
-  if (buf_size > remaining)
-    buf_size = remaining;
+  buf_size = static_cast<int>(std::min(
+      static_cast<int64>(buf_size),
+      byte_range_.last_byte_position() - data_offset_ + 1));
   memcpy(buf->data(), data_->front() + data_offset_, buf_size);
   data_offset_ += buf_size;
   *bytes_read = buf_size;
   return true;
 }
 
 int URLRequestSimpleJob::GetData(std::string* mime_type,
                                  std::string* charset,
                                  std::string* data,
                                  const CompletionCallback& callback) const {
@@ skipping 62 matching lines @@
 
   if (result == OK) {
     // Notify that the headers are complete
     if (!byte_range_.ComputeBounds(data_->size())) {
       NotifyDone(URLRequestStatus(URLRequestStatus::FAILED,
                  ERR_REQUEST_RANGE_NOT_SATISFIABLE));
       return;
     }
 
     data_offset_ = byte_range_.first_byte_position();
-    int remaining_bytes = byte_range_.last_byte_position() -
-        byte_range_.first_byte_position() + 1;
-    set_expected_content_size(remaining_bytes);
+    set_expected_content_size(
+        byte_range_.last_byte_position() - data_offset_ + 1);
     NotifyHeadersComplete();
   } else {
     NotifyStartError(URLRequestStatus(URLRequestStatus::FAILED, result));
   }
 }
 
 }  // namespace net