| Index: chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h
|
| diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h
|
| index 77cf87c75792f32d98023c67cee968f50ca0151c..148713e790551e285e568e1e49eb2e031b165275 100644
|
| --- a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h
|
| +++ b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h
|
| @@ -5,7 +5,9 @@
|
| #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_BUFFERING_FILE_STREAM_READER_H_
|
| #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_BUFFERING_FILE_STREAM_READER_H_
|
|
|
| -#include "base/basictypes.h"
|
| +#include <stdint.h>
|
| +
|
| +#include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| @@ -31,7 +33,7 @@ class BufferingFileStreamReader : public storage::FileStreamReader {
|
| BufferingFileStreamReader(
|
| scoped_ptr<storage::FileStreamReader> file_stream_reader,
|
| int preloading_buffer_length,
|
| - int64 max_bytes_to_read);
|
| + int64_t max_bytes_to_read);
|
|
|
| ~BufferingFileStreamReader() override;
|
|
|
| @@ -39,7 +41,7 @@ class BufferingFileStreamReader : public storage::FileStreamReader {
|
| int Read(net::IOBuffer* buf,
|
| int buf_len,
|
| const net::CompletionCallback& callback) override;
|
| - int64 GetLength(const net::Int64CompletionCallback& callback) override;
|
| + int64_t GetLength(const net::Int64CompletionCallback& callback) override;
|
|
|
| private:
|
| // Copies data from the preloading buffer and updates the internal iterator.
|
| @@ -61,8 +63,8 @@ class BufferingFileStreamReader : public storage::FileStreamReader {
|
|
|
| scoped_ptr<storage::FileStreamReader> file_stream_reader_;
|
| int preloading_buffer_length_;
|
| - int64 max_bytes_to_read_;
|
| - int64 bytes_read_;
|
| + int64_t max_bytes_to_read_;
|
| + int64_t bytes_read_;
|
| scoped_refptr<net::IOBuffer> preloading_buffer_;
|
| int preloading_buffer_offset_;
|
| int preloaded_bytes_;
|
|
|