| Index: chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h
 | 
| diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h
 | 
| index 6d348d177add36cb8532c745cf70947439eaa10a..39e219f0ead045243bbb578b4d404cdd85d23393 100644
 | 
| --- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h
 | 
| +++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h
 | 
| @@ -5,8 +5,10 @@
 | 
|  #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_FILE_STREAM_READER_H_
 | 
|  #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_FILE_STREAM_READER_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"
 | 
| @@ -31,7 +33,7 @@ class FileStreamReader : public storage::FileStreamReader {
 | 
|  
 | 
|    FileStreamReader(storage::FileSystemContext* context,
 | 
|                     const storage::FileSystemURL& url,
 | 
| -                   int64 initial_offset,
 | 
| +                   int64_t initial_offset,
 | 
|                     const base::Time& expected_modification_time);
 | 
|  
 | 
|    ~FileStreamReader() override;
 | 
| @@ -40,7 +42,7 @@ class FileStreamReader : 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:
 | 
|    // Helper class for executing operations on the provided file system. All
 | 
| @@ -97,8 +99,8 @@ class FileStreamReader : public storage::FileStreamReader {
 | 
|    void GetLengthAfterInitialized(const net::Int64CompletionCallback& callback);
 | 
|  
 | 
|    storage::FileSystemURL url_;
 | 
| -  int64 current_offset_;
 | 
| -  int64 current_length_;
 | 
| +  int64_t current_offset_;
 | 
| +  int64_t current_length_;
 | 
|    base::Time expected_modification_time_;
 | 
|    scoped_refptr<OperationRunner> runner_;
 | 
|    State state_;
 | 
| 
 |