| Index: components/drive/service/drive_api_service.h
 | 
| diff --git a/components/drive/service/drive_api_service.h b/components/drive/service/drive_api_service.h
 | 
| index 374edc034ccce98641494a5c88441db62c164a9c..96b8474b946616e50741ea02b41d2b1413281991 100644
 | 
| --- a/components/drive/service/drive_api_service.h
 | 
| +++ b/components/drive/service/drive_api_service.h
 | 
| @@ -5,8 +5,11 @@
 | 
|  #ifndef COMPONENTS_DRIVE_SERVICE_DRIVE_API_SERVICE_H_
 | 
|  #define COMPONENTS_DRIVE_SERVICE_DRIVE_API_SERVICE_H_
 | 
|  
 | 
| +#include <stdint.h>
 | 
| +
 | 
|  #include <string>
 | 
|  
 | 
| +#include "base/macros.h"
 | 
|  #include "base/memory/ref_counted.h"
 | 
|  #include "base/memory/scoped_ptr.h"
 | 
|  #include "base/memory/weak_ptr.h"
 | 
| @@ -54,7 +57,7 @@ class BatchRequestConfigurator : public BatchRequestConfiguratorInterface,
 | 
|    // BatchRequestConfiguratorInterface overrides.
 | 
|    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,
 | 
| @@ -63,7 +66,7 @@ class BatchRequestConfigurator : public BatchRequestConfiguratorInterface,
 | 
|        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 UploadExistingFileOptions& options,
 | 
| @@ -132,7 +135,7 @@ class DriveAPIService : public DriveServiceInterface,
 | 
|        const std::string& directory_resource_id,
 | 
|        const google_apis::FileListCallback& callback) override;
 | 
|    google_apis::CancelCallback GetChangeList(
 | 
| -      int64 start_changestamp,
 | 
| +      int64_t start_changestamp,
 | 
|        const google_apis::ChangeListCallback& callback) override;
 | 
|    google_apis::CancelCallback GetRemainingChangeList(
 | 
|        const GURL& next_link,
 | 
| @@ -193,33 +196,33 @@ class DriveAPIService : public DriveServiceInterface,
 | 
|        const google_apis::FileResourceCallback& 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 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 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,
 | 
| @@ -228,7 +231,7 @@ class DriveAPIService : public 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,
 | 
| 
 |