Switch to standard integer types in sync/.

sync/engine/apply_control_data_updates.cc

 // Copyright 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 "sync/engine/apply_control_data_updates.h"
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/metrics/histogram.h"
 #include "sync/engine/conflict_resolver.h"
 #include "sync/engine/conflict_util.h"
 #include "sync/engine/syncer_util.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/mutable_entry.h"
 #include "sync/syncable/nigori_handler.h"
 #include "sync/syncable/nigori_util.h"
 #include "sync/syncable/syncable_write_transaction.h"
 #include "sync/util/cryptographer.h"
 
 namespace syncer {
 
 void ApplyControlDataUpdates(syncable::Directory* dir) {
   syncable::WriteTransaction trans(FROM_HERE, syncable::SYNCER, dir);
 
-  std::vector<int64> handles;
+  std::vector<int64_t> handles;
   dir->GetUnappliedUpdateMetaHandles(
       &trans, ToFullModelTypeSet(ControlTypes()), &handles);
 
   // First, go through and manually apply any new top level datatype nodes (so
   // that we don't have to worry about hitting a CONFLICT_HIERARCHY with an
   // entry because we haven't applied its parent yet).
   // TODO(sync): if at some point we support control datatypes with actual
   // hierarchies we'll need to revisit this logic.
   ModelTypeSet control_types = ControlTypes();
   for (ModelTypeSet::Iterator iter = control_types.First(); iter.Good();
@@ skipping 24 matching lines @@
                         dir->GetCryptographer(&trans));
     } else {
       ApplyControlUpdate(&trans,
                          &entry,
                          dir->GetCryptographer(&trans));
     }
   }
 
   // Go through the rest of the unapplied control updates, skipping over any
   // top level folders.
-  for (std::vector<int64>::const_iterator iter = handles.begin();
+  for (std::vector<int64_t>::const_iterator iter = handles.begin();
        iter != handles.end(); ++iter) {
     syncable::MutableEntry entry(&trans, syncable::GET_BY_HANDLE, *iter);
     CHECK(entry.good());
     ModelType type = entry.GetServerModelType();
     CHECK(ControlTypes().Has(type));
     if (!entry.GetUniqueServerTag().empty()) {
       // We should have already applied all top level control nodes.
       DCHECK(!entry.GetIsUnappliedUpdate());
       continue;
     }
@@ skipping 136 matching lines @@
                               ConflictResolver::OVERWRITE_LOCAL,
                               ConflictResolver::CONFLICT_RESOLUTION_SIZE);
   }
 
   UpdateAttemptResponse response = AttemptToUpdateEntry(
       trans, entry, cryptographer);
   DCHECK_EQ(SUCCESS, response);
 }
 
 }  // namespace syncer