Switch to standard integer types in components/, part 1 of 4.

components/drive/directory_loader.cc

 // Copyright 2014 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 "components/drive/directory_loader.h"
 
+#include <stddef.h>
+
 #include "base/callback.h"
 #include "base/callback_helpers.h"
+#include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "components/drive/change_list_loader.h"
 #include "components/drive/change_list_loader_observer.h"
 #include "components/drive/change_list_processor.h"
 #include "components/drive/event_logger.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_metadata.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "url/gurl.h"
 
 namespace drive {
 namespace internal {
 
 namespace {
 
 // Minimum changestamp gap required to start loading directory.
 const int kMinimumChangestampGap = 50;
 
 FileError CheckLocalState(ResourceMetadata* resource_metadata,
                           const google_apis::AboutResource& about_resource,
                           const std::string& local_id,
                           ResourceEntry* entry,
-                          int64* local_changestamp) {
+                          int64_t* local_changestamp) {
   // Fill My Drive resource ID.
   ResourceEntry mydrive;
   FileError error = resource_metadata->GetResourceEntryByPath(
       util::GetDriveMyDriveRootPath(), &mydrive);
   if (error != FILE_ERROR_OK)
     return error;
 
   if (mydrive.resource_id().empty()) {
     mydrive.set_resource_id(about_resource.root_folder_id());
     error = resource_metadata->RefreshEntry(mydrive);
@@ skipping 296 matching lines @@
   if (error != FILE_ERROR_OK) {
     OnDirectoryLoadComplete(local_id, error);
     return;
   }
 
   DCHECK(about_resource);
 
   // Check the current status of local metadata, and start loading if needed.
   google_apis::AboutResource* about_resource_ptr = about_resource.get();
   ResourceEntry* entry = new ResourceEntry;
-  int64* local_changestamp = new int64;
+  int64_t* local_changestamp = new int64_t;
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
       base::Bind(&CheckLocalState,
                  resource_metadata_,
                  *about_resource_ptr,
                  local_id,
                  entry,
                  local_changestamp),
       base::Bind(&DirectoryLoader::ReadDirectoryAfterCheckLocalState,
                  weak_ptr_factory_.GetWeakPtr(),
                  base::Passed(&about_resource),
                  local_id,
                  base::Owned(entry),
                  base::Owned(local_changestamp)));
 }
 
 void DirectoryLoader::ReadDirectoryAfterCheckLocalState(
     scoped_ptr<google_apis::AboutResource> about_resource,
     const std::string& local_id,
     const ResourceEntry* entry,
-    const int64* local_changestamp,
+    const int64_t* local_changestamp,
     FileError error) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(about_resource);
 
   if (error != FILE_ERROR_OK) {
     OnDirectoryLoadComplete(local_id, error);
     return;
   }
   // This entry does not exist on the server.
   if (entry->resource_id().empty()) {
     OnDirectoryLoadComplete(local_id, FILE_ERROR_OK);
     return;
   }
 
-  int64 remote_changestamp = about_resource->largest_change_id();
+  int64_t remote_changestamp = about_resource->largest_change_id();
 
   // Start loading the directory.
-  int64 directory_changestamp = std::max(
+  int64_t directory_changestamp = std::max(
       entry->directory_specific_info().changestamp(), *local_changestamp);
 
   DirectoryFetchInfo directory_fetch_info(
       local_id, entry->resource_id(), remote_changestamp);
 
   // If the directory's changestamp is up-to-date or the global changestamp of
   // the metadata DB is new enough (which means the normal changelist loading
   // should finish very soon), just schedule to run the callback, as there is no
   // need to fetch the directory.
   if (directory_changestamp >= remote_changestamp ||
@@ skipping 160 matching lines @@
   // Also notify the observers.
   if (error == FILE_ERROR_OK && !directory_path->empty()) {
     FOR_EACH_OBSERVER(ChangeListLoaderObserver,
                       observers_,
                       OnDirectoryReloaded(*directory_path));
   }
 }
 
 }  // namespace internal
 }  // namespace drive