| Index: chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc
|
| diff --git a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc
|
| index d1fa2c101129439bcda8d3e8cfeae0dc21d37b36..8b728a999b3c5fb4914990d0f83a9278045cd0bf 100644
|
| --- a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc
|
| +++ b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc
|
| @@ -43,7 +43,7 @@ void CallInt64CompletionCallbackWithPlatformFileError(
|
| void ReadBytes(
|
| const storage::FileSystemURL& url,
|
| const scoped_refptr<net::IOBuffer>& buf,
|
| - int64 offset,
|
| + int64_t offset,
|
| int buf_len,
|
| const MTPDeviceAsyncDelegate::ReadBytesSuccessCallback& success_callback,
|
| const net::CompletionCallback& error_callback) {
|
| @@ -67,7 +67,7 @@ void ReadBytes(
|
| MTPFileStreamReader::MTPFileStreamReader(
|
| storage::FileSystemContext* file_system_context,
|
| const storage::FileSystemURL& url,
|
| - int64 initial_offset,
|
| + int64_t initial_offset,
|
| const base::Time& expected_modification_time,
|
| bool do_media_header_validation)
|
| : file_system_context_(file_system_context),
|
| @@ -75,8 +75,7 @@ MTPFileStreamReader::MTPFileStreamReader(
|
| current_offset_(initial_offset),
|
| expected_modification_time_(expected_modification_time),
|
| media_header_validated_(!do_media_header_validation),
|
| - weak_factory_(this) {
|
| -}
|
| + weak_factory_(this) {}
|
|
|
| MTPFileStreamReader::~MTPFileStreamReader() {
|
| }
|
| @@ -126,7 +125,7 @@ int MTPFileStreamReader::Read(net::IOBuffer* buf, int buf_len,
|
| return net::ERR_IO_PENDING;
|
| }
|
|
|
| -int64 MTPFileStreamReader::GetLength(
|
| +int64_t MTPFileStreamReader::GetLength(
|
| const net::Int64CompletionCallback& callback) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
|
|
|
|
|