Index: components/sync_driver/model_association_manager.cc |
diff --git a/components/sync_driver/model_association_manager.cc b/components/sync_driver/model_association_manager.cc |
index b7320063273bd6bf8e72738f0ffdf3a0b9ba5a95..b31f4ab2152fc1fce86d7e432a719569c358b434 100644 |
--- a/components/sync_driver/model_association_manager.cc |
+++ b/components/sync_driver/model_association_manager.cc |
@@ -4,10 +4,14 @@ |
#include "components/sync_driver/model_association_manager.h" |
+#include <stddef.h> |
+#include <stdint.h> |
+ |
#include <algorithm> |
#include <functional> |
#include "base/logging.h" |
+#include "base/macros.h" |
#include "base/message_loop/message_loop.h" |
#include "base/metrics/histogram_macros.h" |
#include "base/trace_event/trace_event.h" |
@@ -72,7 +76,7 @@ static_assert(arraysize(kStartOrder) == |
// The amount of time we wait for association to finish. If some types haven't |
// finished association by the time, DataTypeManager is notified of the |
// unfinished types. |
-const int64 kAssociationTimeOutInSeconds = 600; |
+const int64_t kAssociationTimeOutInSeconds = 600; |
syncer::DataTypeAssociationStats BuildAssociationStatsFromMergeResults( |
const syncer::SyncMergeResult& local_merge_result, |