Switch to standard integer types in chrome/browser/, part 4 of 4.

chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

 // Copyright 2013 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 "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h"
 
+#include <stdint.h>
+
 #include "base/callback.h"
 #include "base/format_macros.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"
@@ skipping 72 matching lines @@
       }
       parents_to_remove_.push_back(parent_tracker.file_id());
     }
     DetachFromNonPrimaryParents(token.Pass());
     return;
   }
 
   if (metadata_database()->GetConflictingTrackers(&trackers)) {
     target_file_id_ = PickPrimaryFile(trackers);
     DCHECK(!target_file_id_.empty());
-    int64 primary_tracker_id = -1;
+    int64_t primary_tracker_id = -1;
     for (TrackerIDSet::const_iterator itr = trackers.begin();
          itr != trackers.end(); ++itr) {
       FileTracker tracker;
       if (!metadata_database()->FindTrackerByTrackerID(*itr, &tracker)) {
         NOTREACHED();
         continue;
       }
       if (tracker.file_id() != target_file_id_) {
         non_primary_file_ids_.push_back(
             std::make_pair(tracker.file_id(), tracker.synced_details().etag()));
@@ skipping 209 matching lines @@
   set_used_network(true);
   return sync_context_->GetDriveService();
 }
 
 MetadataDatabase* ConflictResolver::metadata_database() {
   return sync_context_->GetMetadataDatabase();
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system