Switch to standard integer types in sync/.

sync/engine/directory_commit_contribution.h

 // 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.
 
 #ifndef SYNC_ENGINE_DIRECTORY_COMMIT_CONTRIBUTION_H_
 #define SYNC_ENGINE_DIRECTORY_COMMIT_CONTRIBUTION_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "sync/base/sync_export.h"
 #include "sync/engine/commit_contribution.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/util/syncer_error.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/sessions/directory_type_debug_info_emitter.h"
 #include "sync/sessions/status_controller.h"
 
 namespace syncer {
@@ skipping 53 matching lines @@
   // Returns the number of entries included in this contribution.
   size_t GetNumEntries() const override;
 
  private:
   class DirectoryCommitContributionTest;
   FRIEND_TEST_ALL_PREFIXES(DirectoryCommitContributionTest, GatherByTypes);
   FRIEND_TEST_ALL_PREFIXES(DirectoryCommitContributionTest,
                            GatherAndTruncate);
 
   DirectoryCommitContribution(
-      const std::vector<int64>& metahandles,
+      const std::vector<int64_t>& metahandles,
       const google::protobuf::RepeatedPtrField<sync_pb::SyncEntity>& entities,
       const sync_pb::DataTypeContext& context,
       syncable::Directory* directory,
       DirectoryTypeDebugInfoEmitter* debug_info_emitter);
 
   void UnsetSyncingBits();
 
   syncable::Directory* dir_;
-  const std::vector<int64> metahandles_;
+  const std::vector<int64_t> metahandles_;
   const google::protobuf::RepeatedPtrField<sync_pb::SyncEntity> entities_;
   sync_pb::DataTypeContext context_;
   size_t entries_start_index_;
 
   // This flag is tracks whether or not the directory entries associated with
   // this commit still have their SYNCING bits set.  These bits will be set when
   // the CommitContribution is created with Build() and unset when CleanUp() is
   // called.  This flag must be unset by the time our destructor is called.
   bool syncing_bits_set_;
 
   // A pointer to the commit counters of our parent CommitContributor.
   DirectoryTypeDebugInfoEmitter* debug_info_emitter_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectoryCommitContribution);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_DIRECTORY_COMMIT_CONTRIBUTION_H_