| Index: chrome/browser/sync_file_system/drive_backend/metadata_database_index.h
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index.h b/chrome/browser/sync_file_system/drive_backend/metadata_database_index.h
|
| index c907e6d0426768d698b23a333a142bc5e5de1b71..a6f4510e6814f3c8d3cc9d29f3b7daf04dca8ed5 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index.h
|
| +++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index.h
|
| @@ -5,6 +5,9 @@
|
| #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_METADATA_DATABASE_INDEX_H_
|
| #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_METADATA_DATABASE_INDEX_H_
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <map>
|
| #include <set>
|
| #include <string>
|
| @@ -12,6 +15,7 @@
|
|
|
| #include "base/containers/hash_tables.h"
|
| #include "base/containers/scoped_ptr_hash_map.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "chrome/browser/sync_file_system/drive_backend/metadata_database_index_interface.h"
|
| #include "chrome/browser/sync_file_system/drive_backend/tracker_id_set.h"
|
| @@ -61,53 +65,53 @@ class MetadataDatabaseIndex : public MetadataDatabaseIndexInterface {
|
| void RemoveUnreachableItems() override;
|
| bool GetFileMetadata(const std::string& file_id,
|
| FileMetadata* metadata) const override;
|
| - bool GetFileTracker(int64 tracker_id, FileTracker* tracker) const override;
|
| + bool GetFileTracker(int64_t tracker_id, FileTracker* tracker) const override;
|
| void StoreFileMetadata(scoped_ptr<FileMetadata> metadata) override;
|
| void StoreFileTracker(scoped_ptr<FileTracker> tracker) override;
|
| void RemoveFileMetadata(const std::string& file_id) override;
|
| - void RemoveFileTracker(int64 tracker_id) override;
|
| + void RemoveFileTracker(int64_t tracker_id) override;
|
| TrackerIDSet GetFileTrackerIDsByFileID(
|
| const std::string& file_id) const override;
|
| - int64 GetAppRootTracker(const std::string& app_id) const override;
|
| + int64_t GetAppRootTracker(const std::string& app_id) const override;
|
| TrackerIDSet GetFileTrackerIDsByParentAndTitle(
|
| - int64 parent_tracker_id,
|
| + int64_t parent_tracker_id,
|
| const std::string& title) const override;
|
| - std::vector<int64> GetFileTrackerIDsByParent(
|
| - int64 parent_tracker_id) const override;
|
| + std::vector<int64_t> GetFileTrackerIDsByParent(
|
| + int64_t parent_tracker_id) const override;
|
| std::string PickMultiTrackerFileID() const override;
|
| ParentIDAndTitle PickMultiBackingFilePath() const override;
|
| - int64 PickDirtyTracker() const override;
|
| - void DemoteDirtyTracker(int64 tracker_id) override;
|
| + int64_t PickDirtyTracker() const override;
|
| + void DemoteDirtyTracker(int64_t tracker_id) override;
|
| bool HasDemotedDirtyTracker() const override;
|
| - bool IsDemotedDirtyTracker(int64 tracker_id) const override;
|
| - void PromoteDemotedDirtyTracker(int64 tracker_id) override;
|
| + bool IsDemotedDirtyTracker(int64_t tracker_id) const override;
|
| + void PromoteDemotedDirtyTracker(int64_t tracker_id) override;
|
| bool PromoteDemotedDirtyTrackers() override;
|
| size_t CountDirtyTracker() const override;
|
| size_t CountFileMetadata() const override;
|
| size_t CountFileTracker() const override;
|
| void SetSyncRootRevalidated() const override;
|
| - void SetSyncRootTrackerID(int64 sync_root_id) const override;
|
| - void SetLargestChangeID(int64 largest_change_id) const override;
|
| - void SetNextTrackerID(int64 next_tracker_id) const override;
|
| + void SetSyncRootTrackerID(int64_t sync_root_id) const override;
|
| + void SetLargestChangeID(int64_t largest_change_id) const override;
|
| + void SetNextTrackerID(int64_t next_tracker_id) const override;
|
| bool IsSyncRootRevalidated() const override;
|
| - int64 GetSyncRootTrackerID() const override;
|
| - int64 GetLargestChangeID() const override;
|
| - int64 GetNextTrackerID() const override;
|
| + int64_t GetSyncRootTrackerID() const override;
|
| + int64_t GetLargestChangeID() const override;
|
| + int64_t GetNextTrackerID() const override;
|
| std::vector<std::string> GetRegisteredAppIDs() const override;
|
| - std::vector<int64> GetAllTrackerIDs() const override;
|
| + std::vector<int64_t> GetAllTrackerIDs() const override;
|
| std::vector<std::string> GetAllMetadataIDs() const override;
|
|
|
| private:
|
| typedef base::ScopedPtrHashMap<std::string, scoped_ptr<FileMetadata>>
|
| MetadataByID;
|
| - typedef base::ScopedPtrHashMap<int64, scoped_ptr<FileTracker>> TrackerByID;
|
| + typedef base::ScopedPtrHashMap<int64_t, scoped_ptr<FileTracker>> TrackerByID;
|
| typedef base::hash_map<std::string, TrackerIDSet> TrackerIDsByFileID;
|
| typedef base::hash_map<std::string, TrackerIDSet> TrackerIDsByTitle;
|
| - typedef std::map<int64, TrackerIDsByTitle> TrackerIDsByParentAndTitle;
|
| - typedef base::hash_map<std::string, int64> TrackerIDByAppID;
|
| + typedef std::map<int64_t, TrackerIDsByTitle> TrackerIDsByParentAndTitle;
|
| + typedef base::hash_map<std::string, int64_t> TrackerIDByAppID;
|
| typedef base::hash_set<std::string> FileIDSet;
|
| typedef base::hash_set<ParentIDAndTitle> PathSet;
|
| - typedef std::set<int64> DirtyTrackers;
|
| + typedef std::set<int64_t> DirtyTrackers;
|
|
|
| friend class MetadataDatabaseTest;
|
|
|
|
|