Index: chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h |
diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h |
index dec997ef2bc20f5081cae0cda26d649d03c4ddba..6a56ced1e92475b263245c561415981e14cf5355 100644 |
--- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h |
+++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h |
@@ -5,8 +5,10 @@ |
#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_WEBKIT_FILE_STREAM_READER_IMPL_H_ |
#define CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_WEBKIT_FILE_STREAM_READER_IMPL_H_ |
-#include "base/basictypes.h" |
+#include <stdint.h> |
+ |
#include "base/files/file_path.h" |
+#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
@@ -36,7 +38,7 @@ class WebkitFileStreamReaderImpl : public storage::FileStreamReader { |
const DriveFileStreamReader::FileSystemGetter& file_system_getter, |
base::SequencedTaskRunner* file_task_runner, |
const base::FilePath& drive_file_path, |
- int64 offset, |
+ int64_t offset, |
const base::Time& expected_modification_time); |
~WebkitFileStreamReaderImpl() override; |
@@ -44,7 +46,7 @@ class WebkitFileStreamReaderImpl : public storage::FileStreamReader { |
int Read(net::IOBuffer* buffer, |
int buffer_length, |
const net::CompletionCallback& callback) override; |
- int64 GetLength(const net::Int64CompletionCallback& callback) override; |
+ int64_t GetLength(const net::Int64CompletionCallback& callback) override; |
private: |
// Called upon the initialization completion of |stream_reader_|. |
@@ -70,11 +72,11 @@ class WebkitFileStreamReaderImpl : public storage::FileStreamReader { |
scoped_ptr<DriveFileStreamReader> stream_reader_; |
const base::FilePath drive_file_path_; |
- const int64 offset_; |
+ const int64_t offset_; |
const base::Time expected_modification_time_; |
// This is available only after initialize is done. |
- int64 file_size_; |
+ int64_t file_size_; |
// This should remain the last member so it'll be destroyed first and |
// invalidate its weak pointers before other members are destroyed. |