Switch to standard integer types in sync/.

sync/api/sync_data.h

 // Copyright 2012 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_API_SYNC_DATA_H_
 #define SYNC_API_SYNC_DATA_H_
 
+#include <stdint.h>
+
 #include <iosfwd>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
 #include "sync/api/attachments/attachment_id.h"
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/attachments/attachment_service_proxy.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/util/immutable.h"
 #include "sync/internal_api/public/util/weak_handle.h"
@@ skipping 41 matching lines @@
       const std::string& non_unique_title,
       const sync_pb::EntitySpecifics& specifics);
   static SyncData CreateLocalDataWithAttachments(
       const std::string& sync_tag,
       const std::string& non_unique_title,
       const sync_pb::EntitySpecifics& specifics,
       const AttachmentIdList& attachment_ids);
 
   // Helper method for creating SyncData objects originating from the syncer.
   static SyncData CreateRemoteData(
-      int64 id,
+      int64_t id,
       const sync_pb::EntitySpecifics& specifics,
       const base::Time& last_modified_time,
       const AttachmentIdList& attachment_ids,
       const syncer::AttachmentServiceProxy& attachment_service);
 
   // Whether this SyncData holds valid data. The only way to have a SyncData
   // without valid data is to use the default constructor.
   bool IsValid() const;
 
   // Return the datatype we're holding information about. Derived from the sync
@@ skipping 36 matching lines @@
 
     static sync_pb::SyncEntity* UnwrapMutable(Wrapper* wrapper);
 
     static void Swap(sync_pb::SyncEntity* t1, sync_pb::SyncEntity* t2);
   };
 
   typedef Immutable<sync_pb::SyncEntity, ImmutableSyncEntityTraits>
       ImmutableSyncEntity;
 
   // Equal to kInvalidId iff this is local.
-  int64 id_;
+  int64_t id_;
 
   // This may be null if the SyncData represents a deleted item.
   base::Time remote_modification_time_;
 
   // The actual shared sync entity being held.
   ImmutableSyncEntity immutable_entity_;
 
   AttachmentServiceProxy attachment_service_;
 
  private:
   // Whether this SyncData holds valid data.
   bool is_valid_;
 
   // Clears |entity| and |attachments|.
-  SyncData(int64 id,
+  SyncData(int64_t id,
            sync_pb::SyncEntity* entity,
            const base::Time& remote_modification_time,
            const syncer::AttachmentServiceProxy& attachment_service);
 };
 
 // A SyncData going to the syncer.
 class SYNC_EXPORT SyncDataLocal : public SyncData {
  public:
   // Construct a SyncDataLocal from a SyncData.
   //
@@ skipping 12 matching lines @@
   // Construct a SyncDataRemote from a SyncData.
   //
   // |sync_data|'s IsLocal() must be false.
   explicit SyncDataRemote(const SyncData& sync_data);
   ~SyncDataRemote();
 
   // Return the last motification time according to the server. This may be null
   // if the SyncData represents a deleted item.
   const base::Time& GetModifiedTime() const;
 
-  int64 GetId() const;
+  int64_t GetId() const;
 
   // Retrieve the attachments indentified by |attachment_ids|. Invoke
   // |callback| with the requested attachments.
   //
   // |callback| will be invoked when the operation is complete (successfully
   // or otherwise).
   //
   // Retrieving the requested attachments may require reading local storage or
   // requesting the attachments from the network.
   //
   void GetOrDownloadAttachments(
       const AttachmentIdList& attachment_ids,
       const AttachmentService::GetOrDownloadCallback& callback);
 };
 
 // gmock printer helper.
 void SYNC_EXPORT PrintTo(const SyncData& sync_data, std::ostream* os);
 
 typedef std::vector<SyncData> SyncDataList;
 
 }  // namespace syncer
 
 #endif  // SYNC_API_SYNC_DATA_H_