Switch to standard integer types in sync/.

sync/test/fake_server/fake_server_entity.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 "sync/test/fake_server/fake_server_entity.h"
 
+#include <stdint.h>
+
 #include <limits>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
@@ skipping 17 matching lines @@
 FakeServerEntity::~FakeServerEntity() { }
 
 const std::string& FakeServerEntity::GetId() const {
   return id_;
 }
 
 ModelType FakeServerEntity::GetModelType() const {
   return model_type_;
 }
 
-int64 FakeServerEntity::GetVersion() const {
+int64_t FakeServerEntity::GetVersion() const {
   return version_;
 }
 
-void FakeServerEntity::SetVersion(int64 version) {
+void FakeServerEntity::SetVersion(int64_t version) {
   version_ = version;
 }
 
 const std::string& FakeServerEntity::GetName() const {
   return name_;
 }
 
 void FakeServerEntity::SetName(const std::string& name) {
   name_ = name;
 }
@@ skipping 40 matching lines @@
   int field_number;
   if (tokens.size() != 2 || !base::StringToInt(tokens[0], &field_number)) {
     return syncer::UNSPECIFIED;
   }
 
   return syncer::GetModelTypeFromSpecificsFieldNumber(field_number);
 }
 
 FakeServerEntity::FakeServerEntity(const string& id,
                                    const ModelType& model_type,
-                                   int64 version,
+                                   int64_t version,
                                    const string& name)
-      : id_(id),
-        model_type_(model_type),
-        version_(version),
-        name_(name) {}
+    : id_(id), model_type_(model_type), version_(version), name_(name) {}
 
 void FakeServerEntity::SerializeBaseProtoFields(
     sync_pb::SyncEntity* sync_entity) const {
   sync_pb::EntitySpecifics* specifics = sync_entity->mutable_specifics();
   specifics->CopyFrom(specifics_);
 
   // FakeServerEntity fields
   sync_entity->set_id_string(id_);
   sync_entity->set_version(version_);
   sync_entity->set_name(name_);
 
   // Data via accessors
   sync_entity->set_deleted(IsDeleted());
   sync_entity->set_folder(IsFolder());
 
   if (RequiresParentId())
     sync_entity->set_parent_id_string(GetParentId());
 }
 
 }  // namespace fake_server