| Index: sync/test/fake_server/fake_server_entity.h
|
| diff --git a/sync/test/fake_server/fake_server_entity.h b/sync/test/fake_server/fake_server_entity.h
|
| index 0b197b7b55674936ede07e32aa57968abc42cb05..be2da7df545b1b5dfce475f90c1a4566d5687d0c 100644
|
| --- a/sync/test/fake_server/fake_server_entity.h
|
| +++ b/sync/test/fake_server/fake_server_entity.h
|
| @@ -5,10 +5,11 @@
|
| #ifndef SYNC_TEST_FAKE_SERVER_FAKE_SERVER_ENTITY_H_
|
| #define SYNC_TEST_FAKE_SERVER_FAKE_SERVER_ENTITY_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <map>
|
| #include <string>
|
|
|
| -#include "base/basictypes.h"
|
| #include "sync/internal_api/public/base/model_type.h"
|
| #include "sync/protocol/sync.pb.h"
|
|
|
| @@ -32,8 +33,8 @@ class FakeServerEntity {
|
| virtual ~FakeServerEntity();
|
| const std::string& GetId() const;
|
| syncer::ModelType GetModelType() const;
|
| - int64 GetVersion() const;
|
| - void SetVersion(int64 version);
|
| + int64_t GetVersion() const;
|
| + void SetVersion(int64_t version);
|
| const std::string& GetName() const;
|
| void SetName(const std::string& name);
|
|
|
| @@ -56,7 +57,7 @@ class FakeServerEntity {
|
|
|
| FakeServerEntity(const std::string& id,
|
| const syncer::ModelType& model_type,
|
| - int64 version,
|
| + int64_t version,
|
| const std::string& name);
|
|
|
| void SerializeBaseProtoFields(sync_pb::SyncEntity* sync_entity) const;
|
| @@ -69,7 +70,7 @@ class FakeServerEntity {
|
| syncer::ModelType model_type_;
|
|
|
| // The version of this entity.
|
| - int64 version_;
|
| + int64_t version_;
|
|
|
| // The name of the entity.
|
| std::string name_;
|
|
|