Switch to standard integer types in google_apis/.

google_apis/drive/test_util.cc

 // 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.
 
 #include "google_apis/drive/test_util.h"
 
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 104 matching lines @@
   *out_request = request;
 
   GURL absolute_url = base_url.Resolve(request.relative_url);
   std::string remaining_path;
   if (!RemovePrefix(absolute_url.path(), "/files/", &remaining_path))
     return scoped_ptr<net::test_server::HttpResponse>();
   return CreateHttpResponseFromFile(GetTestFilePath(remaining_path));
 }
 
 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) {
   DCHECK(start_position);
   DCHECK(end_position);
   DCHECK(length);
 
   std::string remaining;
   if (!RemovePrefix(value, "bytes ", &remaining))
     return false;
 
   std::vector<base::StringPiece> parts = base::SplitStringPiece(
       remaining, "/", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   if (parts.size() != 2U)
     return false;
 
   if (!base::StringToInt64(parts[1], length))
     return false;
 
   parts = base::SplitStringPiece(parts[0], "-", base::TRIM_WHITESPACE,
                                  base::SPLIT_WANT_ALL);
   if (parts.size() != 2U)
     return false;
 
   return (base::StringToInt64(parts[0], start_position) &&
           base::StringToInt64(parts[1], end_position));
 }
 
 void AppendProgressCallbackResult(std::vector<ProgressInfo>* progress_values,
-                                  int64 progress,
-                                  int64 total) {
+                                  int64_t progress,
+                                  int64_t total) {
   progress_values->push_back(ProgressInfo(progress, total));
 }
 
 TestGetContentCallback::TestGetContentCallback()
     : callback_(base::Bind(&TestGetContentCallback::OnGetContent,
                            base::Unretained(this))) {
 }
 
 TestGetContentCallback::~TestGetContentCallback() {
 }
 
 std::string TestGetContentCallback::GetConcatenatedData() const {
   std::string result;
   for (size_t i = 0; i < data_.size(); ++i) {
     result += *data_[i];
   }
   return result;
 }
 
 void TestGetContentCallback::OnGetContent(google_apis::DriveApiErrorCode error,
                                           scoped_ptr<std::string> data) {
   data_.push_back(data.release());
 }
 
 }  // namespace test_util
 }  // namespace google_apis