Switch to standard integer types in sync/.

sync/engine/syncer_util.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/syncer_util.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/location.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 114 matching lines @@
     // server side ones to avoid multiple copies of the same thing.
 
     syncable::Id client_item_id = syncable::Id::CreateFromClientString(
         update.originator_client_item_id());
     DCHECK(!client_item_id.ServerKnows());
     syncable::Entry local_entry(trans, GET_BY_ID, client_item_id);
 
     // If it exists, then our local client lost a commit response.  Use
     // the local entry.
     if (local_entry.good() && !local_entry.GetIsDel()) {
-      int64 old_version = local_entry.GetBaseVersion();
-      int64 new_version = update.version();
+      int64_t old_version = local_entry.GetBaseVersion();
+      int64_t new_version = update.version();
       DCHECK_LE(old_version, 0);
       DCHECK_GT(new_version, 0);
       // Otherwise setting the base version could cause a consistency failure.
       // An entry should never be version 0 and SYNCED.
       DCHECK(local_entry.GetIsUnsynced());
 
       // Just a quick sanity check.
       DCHECK(!local_entry.GetId().ServerKnows());
 
       DVLOG(1) << "Reuniting lost commit response IDs. server id: "
@@ skipping 503 matching lines @@
   if (update.version() < target->GetServerVersion()) {
     LOG(WARNING) << "Update older than current server version for "
                  << *target << " Update:"
                  << SyncerProtoUtil::SyncEntityDebugString(update);
     return VERIFY_SUCCESS;  // Expected in new sync protocol.
   }
   return VERIFY_UNDECIDED;
 }
 
 }  // namespace syncer