Switch to standard integer types in google_apis/.

google_apis/drive/drive_api_parser.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/drive_api_parser.h"
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "base/json/json_value_converter.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "google_apis/drive/time_util.h"
 
 namespace google_apis {
 
 namespace {
 
-const int64 kUnsetFileSize = -1;
+const int64_t kUnsetFileSize = -1;
 
 bool CreateFileResourceFromValue(const base::Value* value,
                                  scoped_ptr<FileResource>* file) {
   *file = FileResource::CreateFrom(*value);
   return !!*file;
 }
 
 // Converts |url_string| to |result|.  Always returns true to be used
 // for JSONValueConverter::RegisterCustomField method.
 // TODO(mukai): make it return false in case of invalid |url_string|.
@@ skipping 188 matching lines @@
   if (!IsResourceKindExpected(value, kAboutKind) || !resource->Parse(value)) {
     LOG(ERROR) << "Unable to create: Invalid About resource JSON!";
     return scoped_ptr<AboutResource>();
   }
   return resource.Pass();
 }
 
 // static
 void AboutResource::RegisterJSONConverter(
     base::JSONValueConverter<AboutResource>* converter) {
-  converter->RegisterCustomField<int64>(kLargestChangeId,
-                                        &AboutResource::largest_change_id_,
-                                        &base::StringToInt64);
-  converter->RegisterCustomField<int64>(kQuotaBytesTotal,
-                                        &AboutResource::quota_bytes_total_,
-                                        &base::StringToInt64);
-  converter->RegisterCustomField<int64>(
-      kQuotaBytesUsedAggregate,
-      &AboutResource::quota_bytes_used_aggregate_,
+  converter->RegisterCustomField<int64_t>(kLargestChangeId,
+                                          &AboutResource::largest_change_id_,
+                                          &base::StringToInt64);
+  converter->RegisterCustomField<int64_t>(kQuotaBytesTotal,
+                                          &AboutResource::quota_bytes_total_,
+                                          &base::StringToInt64);
+  converter->RegisterCustomField<int64_t>(
+      kQuotaBytesUsedAggregate, &AboutResource::quota_bytes_used_aggregate_,
       &base::StringToInt64);
   converter->RegisterStringField(kRootFolderId,
                                  &AboutResource::root_folder_id_);
 }
 
 bool AboutResource::Parse(const base::Value& value) {
   base::JSONValueConverter<AboutResource> converter;
   if (!converter.Convert(value, this)) {
     LOG(ERROR) << "Unable to parse: Invalid About resource JSON!";
     return false;
@@ skipping 204 matching lines @@
   converter->RegisterCustomField<base::Time>(
       kLastViewedByMeDate,
       &FileResource::last_viewed_by_me_date_,
       &util::GetTimeFromString);
   converter->RegisterCustomField<base::Time>(
       kSharedWithMeDate,
       &FileResource::shared_with_me_date_,
       &util::GetTimeFromString);
   converter->RegisterBoolField(kShared, &FileResource::shared_);
   converter->RegisterStringField(kMd5Checksum, &FileResource::md5_checksum_);
-  converter->RegisterCustomField<int64>(kFileSize,
-                                        &FileResource::file_size_,
-                                        &base::StringToInt64);
+  converter->RegisterCustomField<int64_t>(kFileSize, &FileResource::file_size_,
+                                          &base::StringToInt64);
   converter->RegisterCustomField<GURL>(kAlternateLink,
                                        &FileResource::alternate_link_,
                                        GetGURLFromString);
   converter->RegisterCustomField<GURL>(kShareLink,
                                        &FileResource::share_link_,
                                        GetGURLFromString);
   converter->RegisterCustomValueField<std::vector<ParentReference> >(
       kParents,
       &FileResource::parents_,
       GetParentsFromValue);
@@ skipping 76 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ChangeResource implementation
 
 ChangeResource::ChangeResource() : change_id_(0), deleted_(false) {}
 
 ChangeResource::~ChangeResource() {}
 
 // static
 void ChangeResource::RegisterJSONConverter(
     base::JSONValueConverter<ChangeResource>* converter) {
-  converter->RegisterCustomField<int64>(kId,
-                                        &ChangeResource::change_id_,
-                                        &base::StringToInt64);
+  converter->RegisterCustomField<int64_t>(kId, &ChangeResource::change_id_,
+                                          &base::StringToInt64);
   converter->RegisterStringField(kFileId, &ChangeResource::file_id_);
   converter->RegisterBoolField(kDeleted, &ChangeResource::deleted_);
   converter->RegisterCustomValueField(kFile, &ChangeResource::file_,
                                       &CreateFileResourceFromValue);
   converter->RegisterCustomField<base::Time>(
       kModificationDate, &ChangeResource::modification_date_,
       &util::GetTimeFromString);
 }
 
 // static
@@ skipping 22 matching lines @@
 ChangeList::ChangeList() : largest_change_id_(0) {}
 
 ChangeList::~ChangeList() {}
 
 // static
 void ChangeList::RegisterJSONConverter(
     base::JSONValueConverter<ChangeList>* converter) {
   converter->RegisterCustomField<GURL>(kNextLink,
                                        &ChangeList::next_link_,
                                        GetGURLFromString);
-  converter->RegisterCustomField<int64>(kLargestChangeId,
-                                        &ChangeList::largest_change_id_,
-                                        &base::StringToInt64);
+  converter->RegisterCustomField<int64_t>(
+      kLargestChangeId, &ChangeList::largest_change_id_, &base::StringToInt64);
   converter->RegisterRepeatedMessage<ChangeResource>(kItems,
                                                      &ChangeList::items_);
 }
 
 // static
 bool ChangeList::HasChangeListKind(const base::Value& value) {
   return IsResourceKindExpected(value, kChangeListKind);
 }
 
 // static
@@ skipping 83 matching lines @@
 bool ImageMediaMetadata::Parse(const base::Value& value) {
   base::JSONValueConverter<ImageMediaMetadata> converter;
   if (!converter.Convert(value, this)) {
     LOG(ERROR) << "Unable to parse: Invalid ImageMediaMetadata.";
     return false;
   }
   return true;
 }
 
 }  // namespace google_apis