| Index: chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h
 | 
| diff --git a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h
 | 
| index 57eafe74316fee8e84bdb1cf16c4ece3c17e4e4e..12d6afc9e81e15eab355c1c6af684103cbb36bc6 100644
 | 
| --- a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h
 | 
| +++ b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h
 | 
| @@ -5,6 +5,9 @@
 | 
|  #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_DRIVE_SERVICE_ON_WORKER_H_
 | 
|  #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_DRIVE_SERVICE_ON_WORKER_H_
 | 
|  
 | 
| +#include <stdint.h>
 | 
| +
 | 
| +#include "base/macros.h"
 | 
|  #include "base/memory/ref_counted.h"
 | 
|  #include "base/memory/weak_ptr.h"
 | 
|  #include "base/sequence_checker.h"
 | 
| @@ -54,7 +57,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
 | 
|        const google_apis::AboutResourceCallback& callback) override;
 | 
|  
 | 
|    google_apis::CancelCallback GetChangeList(
 | 
| -      int64 start_changestamp,
 | 
| +      int64_t start_changestamp,
 | 
|        const google_apis::ChangeListCallback& callback) override;
 | 
|  
 | 
|    google_apis::CancelCallback GetRemainingChangeList(
 | 
| @@ -131,33 +134,33 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
 | 
|        const google_apis::EntryActionCallback& callback) override;
 | 
|    google_apis::CancelCallback InitiateUploadNewFile(
 | 
|        const std::string& content_type,
 | 
| -      int64 content_length,
 | 
| +      int64_t content_length,
 | 
|        const std::string& parent_resource_id,
 | 
|        const std::string& title,
 | 
|        const drive::UploadNewFileOptions& options,
 | 
|        const google_apis::InitiateUploadCallback& callback) override;
 | 
|    google_apis::CancelCallback InitiateUploadExistingFile(
 | 
|        const std::string& content_type,
 | 
| -      int64 content_length,
 | 
| +      int64_t content_length,
 | 
|        const std::string& resource_id,
 | 
|        const drive::UploadExistingFileOptions& options,
 | 
|        const google_apis::InitiateUploadCallback& callback) override;
 | 
|    google_apis::CancelCallback ResumeUpload(
 | 
|        const GURL& upload_url,
 | 
| -      int64 start_position,
 | 
| -      int64 end_position,
 | 
| -      int64 content_length,
 | 
| +      int64_t start_position,
 | 
| +      int64_t end_position,
 | 
| +      int64_t content_length,
 | 
|        const std::string& content_type,
 | 
|        const base::FilePath& local_file_path,
 | 
|        const google_apis::drive::UploadRangeCallback& callback,
 | 
|        const google_apis::ProgressCallback& progress_callback) override;
 | 
|    google_apis::CancelCallback GetUploadStatus(
 | 
|        const GURL& upload_url,
 | 
| -      int64 content_length,
 | 
| +      int64_t content_length,
 | 
|        const google_apis::drive::UploadRangeCallback& callback) override;
 | 
|    google_apis::CancelCallback MultipartUploadNewFile(
 | 
|        const std::string& content_type,
 | 
| -      int64 content_length,
 | 
| +      int64_t content_length,
 | 
|        const std::string& parent_resource_id,
 | 
|        const std::string& title,
 | 
|        const base::FilePath& local_file_path,
 | 
| @@ -166,7 +169,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
 | 
|        const google_apis::ProgressCallback& progress_callback) override;
 | 
|    google_apis::CancelCallback MultipartUploadExistingFile(
 | 
|        const std::string& content_type,
 | 
| -      int64 content_length,
 | 
| +      int64_t content_length,
 | 
|        const std::string& resource_id,
 | 
|        const base::FilePath& local_file_path,
 | 
|        const drive::UploadExistingFileOptions& options,
 | 
| 
 |