Index: components/drive/service/fake_drive_service.h |
diff --git a/components/drive/service/fake_drive_service.h b/components/drive/service/fake_drive_service.h |
index 659765b9ab50a94d111ce75a570f4de6257de5e7..f98819e0060de6570321f27e1070e6906b265ac4 100644 |
--- a/components/drive/service/fake_drive_service.h |
+++ b/components/drive/service/fake_drive_service.h |
@@ -5,9 +5,12 @@ |
#ifndef COMPONENTS_DRIVE_SERVICE_FAKE_DRIVE_SERVICE_H_ |
#define COMPONENTS_DRIVE_SERVICE_FAKE_DRIVE_SERVICE_H_ |
+#include <stdint.h> |
+ |
#include <string> |
#include "base/files/file_path.h" |
+#include "base/macros.h" |
#include "base/threading/thread_checker.h" |
#include "components/drive/service/drive_service_interface.h" |
@@ -79,7 +82,7 @@ class FakeDriveService : public DriveServiceInterface { |
} |
// Changes the quota fields returned from GetAboutResource(). |
- void SetQuotaValue(int64 used, int64 total); |
+ void SetQuotaValue(int64_t used, int64_t total); |
// Returns the AboutResource. |
const google_apis::AboutResource& about_resource() const { |
@@ -157,7 +160,7 @@ class FakeDriveService : 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, |
@@ -218,33 +221,33 @@ class FakeDriveService : 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, |
@@ -253,7 +256,7 @@ class FakeDriveService : 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 UploadExistingFileOptions& options, |
@@ -362,14 +365,13 @@ class FakeDriveService : public DriveServiceInterface { |
// is between |start_offset| (inclusive) and |start_offset| + |max_results| |
// (exclusive). |
// Increments *load_counter by 1 before it returns successfully. |
- void GetChangeListInternal( |
- int64 start_changestamp, |
- const std::string& search_query, |
- const std::string& directory_resource_id, |
- int start_offset, |
- int max_results, |
- int* load_counter, |
- const google_apis::ChangeListCallback& callback); |
+ void GetChangeListInternal(int64_t start_changestamp, |
+ const std::string& search_query, |
+ const std::string& directory_resource_id, |
+ int start_offset, |
+ int max_results, |
+ int* load_counter, |
+ const google_apis::ChangeListCallback& callback); |
// Returns new upload session URL. |
GURL GetNewUploadSessionUrl(); |
@@ -384,8 +386,8 @@ class FakeDriveService : public DriveServiceInterface { |
scoped_ptr<google_apis::AboutResource> about_resource_; |
scoped_ptr<base::DictionaryValue> app_info_value_; |
std::map<GURL, UploadSession> upload_sessions_; |
- int64 published_date_seq_; |
- int64 next_upload_sequence_number_; |
+ int64_t published_date_seq_; |
+ int64_t next_upload_sequence_number_; |
int default_max_results_; |
int resource_id_count_; |
int file_list_load_count_; |