Index: chrome/browser/sync_file_system/drive_backend/metadata_database_index_interface.h |
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_interface.h b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_interface.h |
index 0c06301f3700ca1c8b3815191f76f945ac97552a..622c35c39223dd67b24939fe10becebd869e7012 100644 |
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_interface.h |
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_interface.h |
@@ -5,10 +5,13 @@ |
#ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_METADATA_DATABASE_INDEX_INTERFACE_H_ |
#define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_METADATA_DATABASE_INDEX_INTERFACE_H_ |
+#include <stddef.h> |
+#include <stdint.h> |
+ |
#include <string> |
#include <vector> |
-#include "base/basictypes.h" |
+#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
namespace sync_file_system { |
@@ -19,11 +22,11 @@ class FileTracker; |
class TrackerIDSet; |
struct ParentIDAndTitle { |
- int64 parent_id; |
+ int64_t parent_id; |
std::string title; |
ParentIDAndTitle(); |
- ParentIDAndTitle(int64 parent_id, const std::string& title); |
+ ParentIDAndTitle(int64_t parent_id, const std::string& title); |
}; |
bool operator==(const ParentIDAndTitle& left, const ParentIDAndTitle& right); |
@@ -45,8 +48,8 @@ class MetadataDatabaseIndexInterface { |
// Returns true if FileTracker identified by |tracker_id| exists. |
// If |tracker| is not NULL, the FileTracker is copied to it. |
- virtual bool GetFileTracker( |
- int64 tracker_id, FileTracker* tracker) const = 0; |
+ virtual bool GetFileTracker(int64_t tracker_id, |
+ FileTracker* tracker) const = 0; |
// Stores |metadata| and updates indexes. |
// This overwrites existing FileMetadata for the same |file_id|. |
@@ -60,7 +63,7 @@ class MetadataDatabaseIndexInterface { |
virtual void RemoveFileMetadata(const std::string& file_id) = 0; |
// Removes FileTracker identified by |tracker_id| from indexes. |
- virtual void RemoveFileTracker(int64 tracker_id) = 0; |
+ virtual void RemoveFileTracker(int64_t tracker_id) = 0; |
// Returns a set of FileTracker that have |file_id| as its own. |
virtual TrackerIDSet GetFileTrackerIDsByFileID( |
@@ -68,15 +71,15 @@ class MetadataDatabaseIndexInterface { |
// Returns an app-root tracker identified by |app_id|. Returns 0 if not |
// found. |
- virtual int64 GetAppRootTracker(const std::string& app_id) const = 0; |
+ virtual int64_t GetAppRootTracker(const std::string& app_id) const = 0; |
// Returns a set of FileTracker that have |parent_tracker_id| and |title|. |
virtual TrackerIDSet GetFileTrackerIDsByParentAndTitle( |
- int64 parent_tracker_id, |
+ int64_t parent_tracker_id, |
const std::string& title) const = 0; |
- virtual std::vector<int64> GetFileTrackerIDsByParent( |
- int64 parent_tracker_id) const = 0; |
+ virtual std::vector<int64_t> GetFileTrackerIDsByParent( |
+ int64_t parent_tracker_id) const = 0; |
// Returns the |file_id| of a file that has multiple trackers. |
virtual std::string PickMultiTrackerFileID() const = 0; |
@@ -87,16 +90,16 @@ class MetadataDatabaseIndexInterface { |
// Returns a FileTracker whose |dirty| is set and which isn't demoted. |
// Returns 0 if not found. |
- virtual int64 PickDirtyTracker() const = 0; |
+ virtual int64_t PickDirtyTracker() const = 0; |
// Demotes a dirty tracker. |
- virtual void DemoteDirtyTracker(int64 tracker_id) = 0; |
+ virtual void DemoteDirtyTracker(int64_t tracker_id) = 0; |
virtual bool HasDemotedDirtyTracker() const = 0; |
- virtual bool IsDemotedDirtyTracker(int64 tracker_id) const = 0; |
+ virtual bool IsDemotedDirtyTracker(int64_t tracker_id) const = 0; |
// Promotes single demoted dirty tracker to a normal dirty tracker. |
- virtual void PromoteDemotedDirtyTracker(int64 tracker_id) = 0; |
+ virtual void PromoteDemotedDirtyTracker(int64_t tracker_id) = 0; |
// Promotes all demoted dirty trackers to normal dirty trackers. |
// Returns true if any tracker was promoted. |
@@ -107,15 +110,15 @@ class MetadataDatabaseIndexInterface { |
virtual size_t CountFileTracker() const = 0; |
virtual void SetSyncRootRevalidated() const = 0; |
- virtual void SetSyncRootTrackerID(int64 sync_root_id) const = 0; |
- virtual void SetLargestChangeID(int64 largest_change_id) const = 0; |
- virtual void SetNextTrackerID(int64 next_tracker_id) const = 0; |
+ virtual void SetSyncRootTrackerID(int64_t sync_root_id) const = 0; |
+ virtual void SetLargestChangeID(int64_t largest_change_id) const = 0; |
+ virtual void SetNextTrackerID(int64_t next_tracker_id) const = 0; |
virtual bool IsSyncRootRevalidated() const = 0; |
- virtual int64 GetSyncRootTrackerID() const = 0; |
- virtual int64 GetLargestChangeID() const = 0; |
- virtual int64 GetNextTrackerID() const = 0; |
+ virtual int64_t GetSyncRootTrackerID() const = 0; |
+ virtual int64_t GetLargestChangeID() const = 0; |
+ virtual int64_t GetNextTrackerID() const = 0; |
virtual std::vector<std::string> GetRegisteredAppIDs() const = 0; |
- virtual std::vector<int64> GetAllTrackerIDs() const = 0; |
+ virtual std::vector<int64_t> GetAllTrackerIDs() const = 0; |
virtual std::vector<std::string> GetAllMetadataIDs() const = 0; |
private: |