Switch to standard integer types in chrome/browser/chromeos/.

chrome/browser/chromeos/fileapi/external_file_url_request_job.cc

 // Copyright 2014 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 "chrome/browser/chromeos/fileapi/external_file_url_request_job.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h"
 #include "chrome/browser/extensions/api/file_handlers/mime_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "components/drive/file_system_core_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
@@ skipping 268 matching lines @@
         net::URLRequestStatus(net::URLRequestStatus::FAILED, net::ERR_FAILED));
     return;
   }
 
   // Compute content size.
   if (!byte_range_.ComputeBounds(file_info.size)) {
     NotifyStartError(net::URLRequestStatus(
         net::URLRequestStatus::FAILED, net::ERR_REQUEST_RANGE_NOT_SATISFIABLE));
     return;
   }
-  const int64 offset = byte_range_.first_byte_position();
-  const int64 size =
+  const int64_t offset = byte_range_.first_byte_position();
+  const int64_t size =
       byte_range_.last_byte_position() + 1 - byte_range_.first_byte_position();
   set_expected_content_size(size);
   remaining_bytes_ = size;
 
   // Create file stream reader.
   stream_reader_ = file_system_context_->CreateFileStreamReader(
       file_system_url_, offset, size, base::Time());
   if (!stream_reader_) {
     NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
                                            net::ERR_FILE_NOT_FOUND));
@@ skipping 33 matching lines @@
 }
 
 int ExternalFileURLRequestJob::ReadRawData(net::IOBuffer* buf, int buf_size) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(stream_reader_);
 
   if (remaining_bytes_ == 0)
     return 0;
 
   const int result = stream_reader_->Read(
-      buf, std::min<int64>(buf_size, remaining_bytes_),
+      buf, std::min<int64_t>(buf_size, remaining_bytes_),
       base::Bind(&ExternalFileURLRequestJob::OnReadCompleted,
                  weak_ptr_factory_.GetWeakPtr()));
 
   if (result < 0)
     return result;
 
   remaining_bytes_ -= result;
   return result;
 }
 
 ExternalFileURLRequestJob::~ExternalFileURLRequestJob() {
 }
 
 void ExternalFileURLRequestJob::OnReadCompleted(int read_result) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (read_result > 0)
     remaining_bytes_ -= read_result;
 
   ReadRawDataComplete(read_result);
 }
 
 }  // namespace chromeos