commit 6a64b814b5f9ccdea00f64228f15a3d8fbd31790
author James Robinson <jamesr@chromium.org> Wed Dec 03 13:38:42 2014 -0800
committer James Robinson <jamesr@chromium.org> Wed Dec 03 13:38:42 2014 -0800
tree 3db4801ae7c4fd14847db50c143c9685630af1f1
parent c9b163e587844fa5c25589116d016b6004ac66a5

Update from https://crrev.com/306655

Includes updates to ui/ and mojo/services for cc and gpu changes and
a minor update to a unit test in sky/ for skia interface changes.

Review URL: https://codereview.chromium.org/761903003

net/base/upload_file_element_reader.cc

diff --git a/net/base/upload_file_element_reader.cc b/net/base/upload_file_element_reader.cc
index 4682466..9be9117 100644
--- a/net/base/upload_file_element_reader.cc
+++ b/net/base/upload_file_element_reader.cc
@@ -78,8 +78,8 @@
                                   const CompletionCallback& callback) {
   DCHECK(!callback.is_null());
 
-  uint64 num_bytes_to_read =
-      std::min(BytesRemaining(), static_cast<uint64>(buf_length));
+  int num_bytes_to_read = static_cast<int>(
+      std::min(BytesRemaining(), static_cast<uint64>(buf_length)));
   if (num_bytes_to_read == 0)
     return 0;
 
@@ -140,7 +140,7 @@
   if (result < 0) {
     DLOG(WARNING) << "Failed to seek \"" << path_.value()
                   << "\" to offset: " << range_offset_ << " (" << result << ")";
-    callback.Run(result);
+    callback.Run(static_cast<int>(result));
     return;
   }