Switch to standard integer types in google_apis/.

google_apis/drive/test_util.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_TEST_UTIL_H_
 #define GOOGLE_APIS_DRIVE_TEST_UTIL_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/template_util.h"
 #include "google_apis/drive/base_requests.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 #include "google_apis/drive/task_util.h"
 
 class GURL;
 
 namespace base {
@@ skipping 66 matching lines @@
 // |base_url| must be set to the server's base url.
 scoped_ptr<net::test_server::HttpResponse> HandleDownloadFileRequest(
     const GURL& base_url,
     net::test_server::HttpRequest* out_request,
     const net::test_server::HttpRequest& request);
 
 // Parses a value of Content-Range header, which looks like
 // "bytes <start_position>-<end_position>/<length>".
 // Returns true on success.
 bool ParseContentRangeHeader(const std::string& value,
-                             int64* start_position,
-                             int64* end_position,
-                             int64* length);
+                             int64_t* start_position,
+                             int64_t* end_position,
+                             int64_t* length);
 
 // Google API related code and Drive File System code work on asynchronous
 // architecture and return the results via callbacks.
 // Following code implements a callback to copy such results.
 // Here is how to use:
 //
 //   // Prepare result storage.
 //   ResultType1 result1;
 //   ResultType2 result2;
 //           :
@@ skipping 145 matching lines @@
 base::Callback<void(typename internal::CopyResultCallbackHelper<T1>::InType,
                     typename internal::CopyResultCallbackHelper<T2>::InType,
                     typename internal::CopyResultCallbackHelper<T3>::InType,
                     typename internal::CopyResultCallbackHelper<T4>::InType)>
 CreateCopyResultCallback(T1* out1, T2* out2, T3* out3, T4* out4) {
   return base::Bind(
       &internal::CopyResultCallback<T1, T2, T3, T4>,
       internal::OutputParams<T1, T2, T3, T4>(out1, out2, out3, out4));
 }
 
-typedef std::pair<int64, int64> ProgressInfo;
+typedef std::pair<int64_t, int64_t> ProgressInfo;
 
 // Helper utility for recording the results via ProgressCallback.
 void AppendProgressCallbackResult(std::vector<ProgressInfo>* progress_values,
-                                  int64 progress,
-                                  int64 total);
+                                  int64_t progress,
+                                  int64_t total);
 
 // Helper utility for recording the content via GetContentCallback.
 class TestGetContentCallback {
  public:
   TestGetContentCallback();
   ~TestGetContentCallback();
 
   const GetContentCallback& callback() const { return callback_; }
   const ScopedVector<std::string>& data() const { return data_; }
   ScopedVector<std::string>* mutable_data() { return &data_; }
   std::string GetConcatenatedData() const;
 
  private:
   void OnGetContent(google_apis::DriveApiErrorCode error,
                     scoped_ptr<std::string> data);
 
   const GetContentCallback callback_;
   ScopedVector<std::string> data_;
 
   DISALLOW_COPY_AND_ASSIGN(TestGetContentCallback);
 };
 
 }  // namespace test_util
 }  // namespace google_apis
 
 #endif  // GOOGLE_APIS_DRIVE_TEST_UTIL_H_