Index: sync/engine/non_blocking_type_commit_contribution.h |
diff --git a/sync/engine/non_blocking_type_commit_contribution.h b/sync/engine/non_blocking_type_commit_contribution.h |
index 41ee4de5046d9e0569cbc35ac611ddacdb9f5abc..f0fddcfc6ceda1a8336295fe47e12b2371ce03e6 100644 |
--- a/sync/engine/non_blocking_type_commit_contribution.h |
+++ b/sync/engine/non_blocking_type_commit_contribution.h |
@@ -5,9 +5,12 @@ |
#ifndef SYNC_ENGINE_NON_BLOCKING_TYPE_COMMIT_CONTRIBUTION_H_ |
#define SYNC_ENGINE_NON_BLOCKING_TYPE_COMMIT_CONTRIBUTION_H_ |
+#include <stddef.h> |
+#include <stdint.h> |
+ |
#include <vector> |
-#include "base/basictypes.h" |
+#include "base/macros.h" |
#include "sync/engine/commit_contribution.h" |
#include "sync/protocol/sync.pb.h" |
@@ -24,7 +27,7 @@ class NonBlockingTypeCommitContribution : public syncer::CommitContribution { |
NonBlockingTypeCommitContribution( |
const sync_pb::DataTypeContext& context, |
const google::protobuf::RepeatedPtrField<sync_pb::SyncEntity>& entities, |
- const std::vector<int64>& sequence_numbers, |
+ const std::vector<int64_t>& sequence_numbers, |
ModelTypeWorker* worker); |
~NonBlockingTypeCommitContribution() override; |
@@ -48,7 +51,7 @@ class NonBlockingTypeCommitContribution : public syncer::CommitContribution { |
// The sequence numbers associated with the pending commits. These match up |
// with the entities_ vector. |
- const std::vector<int64> sequence_numbers_; |
+ const std::vector<int64_t> sequence_numbers_; |
// The index in the commit message where this contribution's entities are |
// added. Used to correlate per-item requests with per-item responses. |