| 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 406965245043dd9f3cc79c96bd30c96fc0b06f2e..688ae85ff8c3542711aa294a9fdcee4f8a53918a 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
|
| @@ -58,17 +58,18 @@ class MetadataDatabaseIndex : public MetadataDatabaseIndexInterface {
|
| public:
|
| ~MetadataDatabaseIndex() override;
|
|
|
| - static scoped_ptr<MetadataDatabaseIndex> Create(LevelDBWrapper* db);
|
| - static scoped_ptr<MetadataDatabaseIndex> CreateForTesting(
|
| - DatabaseContents* contents, LevelDBWrapper* db);
|
| + static std::unique_ptr<MetadataDatabaseIndex> Create(LevelDBWrapper* db);
|
| + static std::unique_ptr<MetadataDatabaseIndex> CreateForTesting(
|
| + DatabaseContents* contents,
|
| + LevelDBWrapper* db);
|
|
|
| // MetadataDatabaseIndexInterface overrides.
|
| void RemoveUnreachableItems() override;
|
| bool GetFileMetadata(const std::string& file_id,
|
| FileMetadata* metadata) 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 StoreFileMetadata(std::unique_ptr<FileMetadata> metadata) override;
|
| + void StoreFileTracker(std::unique_ptr<FileTracker> tracker) override;
|
| void RemoveFileMetadata(const std::string& file_id) override;
|
| void RemoveFileTracker(int64_t tracker_id) override;
|
| TrackerIDSet GetFileTrackerIDsByFileID(
|
| @@ -103,9 +104,10 @@ class MetadataDatabaseIndex : public MetadataDatabaseIndexInterface {
|
| std::vector<std::string> GetAllMetadataIDs() const override;
|
|
|
| private:
|
| - typedef base::ScopedPtrHashMap<std::string, scoped_ptr<FileMetadata>>
|
| + typedef base::ScopedPtrHashMap<std::string, std::unique_ptr<FileMetadata>>
|
| MetadataByID;
|
| - typedef base::ScopedPtrHashMap<int64_t, scoped_ptr<FileTracker>> TrackerByID;
|
| + typedef base::ScopedPtrHashMap<int64_t, std::unique_ptr<FileTracker>>
|
| + TrackerByID;
|
| typedef base::hash_map<std::string, TrackerIDSet> TrackerIDsByFileID;
|
| typedef base::hash_map<std::string, TrackerIDSet> TrackerIDsByTitle;
|
| typedef std::map<int64_t, TrackerIDsByTitle> TrackerIDsByParentAndTitle;
|
| @@ -117,7 +119,7 @@ class MetadataDatabaseIndex : public MetadataDatabaseIndexInterface {
|
| friend class MetadataDatabaseTest;
|
|
|
| explicit MetadataDatabaseIndex(LevelDBWrapper* db);
|
| - void Initialize(scoped_ptr<ServiceMetadata> service_metadata,
|
| + void Initialize(std::unique_ptr<ServiceMetadata> service_metadata,
|
| DatabaseContents* contents);
|
|
|
| // Maintains |app_root_by_app_id_|.
|
| @@ -144,7 +146,7 @@ class MetadataDatabaseIndex : public MetadataDatabaseIndexInterface {
|
| const FileTracker& new_tracker);
|
| void RemoveFromDirtyTrackerIndexes(const FileTracker& tracker);
|
|
|
| - scoped_ptr<ServiceMetadata> service_metadata_;
|
| + std::unique_ptr<ServiceMetadata> service_metadata_;
|
| LevelDBWrapper* db_; // Not owned
|
|
|
| MetadataByID metadata_by_id_;
|
|
|