| Index: sync/engine/syncer.h
|
| diff --git a/sync/engine/syncer.h b/sync/engine/syncer.h
|
| index 92859670bbce5ebd25b5d5b9f0fc2df5740216bd..926e0d61bed9c60020a7e9c5b391c8962b077ea2 100644
|
| --- a/sync/engine/syncer.h
|
| +++ b/sync/engine/syncer.h
|
| @@ -5,12 +5,14 @@
|
| #ifndef SYNC_ENGINE_SYNCER_H_
|
| #define SYNC_ENGINE_SYNCER_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <utility>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/callback.h"
|
| #include "base/gtest_prod_util.h"
|
| +#include "base/macros.h"
|
| #include "base/synchronization/lock.h"
|
| #include "sync/base/sync_export.h"
|
| #include "sync/engine/conflict_resolver.h"
|
| @@ -36,7 +38,7 @@ class GetUpdatesProcessor;
|
| // lock contention, or on tasks posted to other threads.
|
| class SYNC_EXPORT Syncer {
|
| public:
|
| - typedef std::vector<int64> UnsyncedMetaHandles;
|
| + typedef std::vector<int64_t> UnsyncedMetaHandles;
|
|
|
| explicit Syncer(CancelationSignal* cancelation_signal);
|
| virtual ~Syncer();
|
|
|