Switch to standard integer types in google_apis/.

google_apis/drive/drive_api_requests.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_
 #define GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "google_apis/drive/base_requests.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/drive_api_url_generator.h"
 #include "google_apis/drive/drive_common_callbacks.h"
 
@@ skipping 606 matching lines @@
   }
 
   int max_results() const { return max_results_; }
   void set_max_results(int max_results) { max_results_ = max_results; }
 
   const std::string& page_token() const { return page_token_; }
   void set_page_token(const std::string& page_token) {
     page_token_ = page_token;
   }
 
-  int64 start_change_id() const { return start_change_id_; }
-  void set_start_change_id(int64 start_change_id) {
+  int64_t start_change_id() const { return start_change_id_; }
+  void set_start_change_id(int64_t start_change_id) {
     start_change_id_ = start_change_id;
   }
 
  protected:
   // Overridden from DriveApiDataRequest.
   GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
   bool include_deleted_;
   int max_results_;
   std::string page_token_;
-  int64 start_change_id_;
+  int64_t start_change_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ChangesListRequest);
 };
 
 //======================== ChangesListNextPageRequest =========================
 
 // There are two ways to obtain next pages of "Changes: list" result (if paged).
 // 1) Set pageToken and all params used for the initial request.
 // 2) Use URL in the nextLink field in the previous response.
 // This class implements 2)'s request.
@@ skipping 147 matching lines @@
 // This class performs the request for initiating the upload of a new file.
 class InitiateUploadNewFileRequest : public InitiateUploadRequestBase {
  public:
   // |parent_resource_id| should be the resource id of the parent directory.
   // |title| should be set.
   // See also the comments of InitiateUploadRequestBase for more details
   // about the other parameters.
   InitiateUploadNewFileRequest(RequestSender* sender,
                                const DriveApiUrlGenerator& url_generator,
                                const std::string& content_type,
-                               int64 content_length,
+                               int64_t content_length,
                                const std::string& parent_resource_id,
                                const std::string& title,
                                const InitiateUploadCallback& callback);
   ~InitiateUploadNewFileRequest() override;
 
   // Optional parameters.
   const base::Time& modified_date() const { return modified_date_; }
   void set_modified_date(const base::Time& modified_date) {
     modified_date_ = modified_date;
   }
@@ skipping 34 matching lines @@
 class InitiateUploadExistingFileRequest : public InitiateUploadRequestBase {
  public:
   // |upload_url| should be the upload_url() of the file
   //    (resumable-create-media URL)
   // |etag| should be set if it is available to detect the upload confliction.
   // See also the comments of InitiateUploadRequestBase for more details
   // about the other parameters.
   InitiateUploadExistingFileRequest(RequestSender* sender,
                                     const DriveApiUrlGenerator& url_generator,
                                     const std::string& content_type,
-                                    int64 content_length,
+                                    int64_t content_length,
                                     const std::string& resource_id,
                                     const std::string& etag,
                                     const InitiateUploadCallback& callback);
   ~InitiateUploadExistingFileRequest() override;
 
   // Optional parameters.
   const std::string& parent_resource_id() const { return parent_resource_id_; }
   void set_parent_resource_id(const std::string& parent_resource_id) {
     parent_resource_id_ = parent_resource_id;
   }
@@ skipping 43 matching lines @@
 
 //============================ ResumeUploadRequest ===========================
 
 // Performs the request for resuming the upload of a file.
 class ResumeUploadRequest : public ResumeUploadRequestBase {
  public:
   // See also ResumeUploadRequestBase's comment for parameters meaning.
   // |callback| must not be null. |progress_callback| may be null.
   ResumeUploadRequest(RequestSender* sender,
                       const GURL& upload_location,
-                      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 UploadRangeCallback& callback,
                       const ProgressCallback& progress_callback);
   ~ResumeUploadRequest() override;
 
  protected:
   // UploadRangeRequestBase overrides.
   void OnRangeRequestComplete(const UploadRangeResponse& response,
                               scoped_ptr<base::Value> value) override;
   // content::UrlFetcherDelegate overrides.
   void OnURLFetchUploadProgress(const net::URLFetcher* source,
-                                int64 current,
-                                int64 total) override;
+                                int64_t current,
+                                int64_t total) override;
 
  private:
   const UploadRangeCallback callback_;
   const ProgressCallback progress_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ResumeUploadRequest);
 };
 
 //========================== GetUploadStatusRequest ==========================
 
 // Performs the request to fetch the current upload status of a file.
 class GetUploadStatusRequest : public GetUploadStatusRequestBase {
  public:
   // See also GetUploadStatusRequestBase's comment for parameters meaning.
   // |callback| must not be null.
   GetUploadStatusRequest(RequestSender* sender,
                          const GURL& upload_url,
-                         int64 content_length,
+                         int64_t content_length,
                          const UploadRangeCallback& callback);
   ~GetUploadStatusRequest() override;
 
  protected:
   // UploadRangeRequestBase overrides.
   void OnRangeRequestComplete(const UploadRangeResponse& response,
                               scoped_ptr<base::Value> value) override;
 
  private:
   const UploadRangeCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(GetUploadStatusRequest);
 };
 
 //======================= MultipartUploadNewFileDelegate =======================
 
 // This class performs the request for initiating the upload of a new file.
 class MultipartUploadNewFileDelegate : public MultipartUploadRequestBase {
  public:
   // |parent_resource_id| should be the resource id of the parent directory.
   // |title| should be set.
   // See also the comments of MultipartUploadRequestBase for more details
   // about the other parameters.
   MultipartUploadNewFileDelegate(base::SequencedTaskRunner* task_runner,
                                  const std::string& title,
                                  const std::string& parent_resource_id,
                                  const std::string& content_type,
-                                 int64 content_length,
+                                 int64_t content_length,
                                  const base::Time& modified_date,
                                  const base::Time& last_viewed_by_me_date,
                                  const base::FilePath& local_file_path,
                                  const Properties& properties,
                                  const DriveApiUrlGenerator& url_generator,
                                  const FileResourceCallback& callback,
                                  const ProgressCallback& progress_callback);
   ~MultipartUploadNewFileDelegate() override;
 
  protected:
@@ skipping 16 matching lines @@
   // |parent_resource_id| should be the resource id of the parent directory.
   // |title| should be set.
   // See also the comments of MultipartUploadRequestBase for more details
   // about the other parameters.
   MultipartUploadExistingFileDelegate(
       base::SequencedTaskRunner* task_runner,
       const std::string& title,
       const std::string& resource_id,
       const std::string& parent_resource_id,
       const std::string& content_type,
-      int64 content_length,
+      int64_t content_length,
       const base::Time& modified_date,
       const base::Time& last_viewed_by_me_date,
       const base::FilePath& local_file_path,
       const std::string& etag,
       const Properties& properties,
       const DriveApiUrlGenerator& url_generator,
       const FileResourceCallback& callback,
       const ProgressCallback& progress_callback);
   ~MultipartUploadExistingFileDelegate() override;
 
@@ skipping 91 matching lines @@
  private:
   GURL GetURL() const override;
   net::URLFetcher::RequestType GetRequestType() const override;
   std::vector<std::string> GetExtraRequestHeaders() const override;
   void Prepare(const PrepareCallback& callback) override;
   bool GetContentData(std::string* upload_content_type,
                       std::string* upload_content) override;
   void RunCallbackOnPrematureFailure(DriveApiErrorCode code) override;
   void ProcessURLFetchResults(const net::URLFetcher* source) override;
   void OnURLFetchUploadProgress(const net::URLFetcher* source,
-                                int64 current,
-                                int64 total) override;
+                                int64_t current,
+                                int64_t total) override;
   scoped_ptr<BatchableDelegate> delegate_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<SingleBatchableDelegateRequest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SingleBatchableDelegateRequest);
 };
 
 //========================== BatchUploadRequest ==========================
 
 class BatchUploadChildEntry {
  public:
   explicit BatchUploadChildEntry(BatchableDelegate* request);
   ~BatchUploadChildEntry();
   scoped_ptr<BatchableDelegate> request;
   bool prepared;
-  int64 data_offset;
-  int64 data_size;
+  int64_t data_offset;
+  int64_t data_size;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BatchUploadChildEntry);
 };
 
 class BatchUploadRequest : public UrlFetchRequestBase {
  public:
   BatchUploadRequest(RequestSender* sender,
                      const DriveApiUrlGenerator& url_generator);
   ~BatchUploadRequest() override;
@@ skipping 24 matching lines @@
   GURL GetURL() const override;
   net::URLFetcher::RequestType GetRequestType() const override;
   std::vector<std::string> GetExtraRequestHeaders() const override;
   bool GetContentData(std::string* upload_content_type,
                       std::string* upload_content) override;
   void ProcessURLFetchResults(const net::URLFetcher* source) override;
   void RunCallbackOnPrematureFailure(DriveApiErrorCode code) override;
 
   // content::UrlFetcherDelegate overrides.
   void OnURLFetchUploadProgress(const net::URLFetcher* source,
-                                int64 current,
-                                int64 total) override;
+                                int64_t current,
+                                int64_t total) override;
 
  private:
   typedef void* RequestID;
   // Obtains corresponding child entry of |request_id|. Returns NULL if the
   // entry is not found.
   ScopedVector<BatchUploadChildEntry>::iterator GetChildEntry(
       RequestID request_id);
 
   // Called after child requests' |Prepare| method.
   void OnChildRequestPrepared(RequestID request_id, DriveApiErrorCode result);
@@ skipping 11 matching lines @@
   PrepareCallback prepare_callback_;
   bool committed_;
 
   // Boundary of multipart body.
   std::string boundary_;
 
   // Multipart of child requests.
   ContentTypeAndData upload_content_;
 
   // Last reported progress value.
-  int64 last_progress_value_;
+  int64_t last_progress_value_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BatchUploadRequest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BatchUploadRequest);
 };
 
 }  // namespace drive
 }  // namespace google_apis
 
 #endif  // GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_