| Index: chrome/browser/sync_file_system/drive_backend/metadata_database.h
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.h b/chrome/browser/sync_file_system/drive_backend/metadata_database.h
|
| index 327cf190a1b2f8161e6dd6e495e4b4b5ea9f73e1..e88b0f0133874f8ee0d0fe7fe917ee81737fe923 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/metadata_database.h
|
| +++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.h
|
| @@ -29,9 +29,7 @@ class SingleThreadTaskRunner;
|
| }
|
|
|
| namespace leveldb {
|
| -class DB;
|
| class Env;
|
| -class WriteBatch;
|
| }
|
|
|
| namespace google_apis {
|
| @@ -50,6 +48,7 @@ namespace drive_backend {
|
| class FileDetails;
|
| class FileMetadata;
|
| class FileTracker;
|
| +class LevelDBWrapper;
|
| class MetadataDatabaseIndexInterface;
|
| class ServiceMetadata;
|
|
|
| @@ -139,7 +138,7 @@ class MetadataDatabase {
|
| leveldb::Env* env_override,
|
| const CreateCallback& callback);
|
| static SyncStatusCode CreateForTesting(
|
| - scoped_ptr<leveldb::DB> db,
|
| + scoped_ptr<LevelDBWrapper> db,
|
| scoped_ptr<MetadataDatabase>* metadata_database_out);
|
|
|
| ~MetadataDatabase();
|
| @@ -360,27 +359,22 @@ class MetadataDatabase {
|
|
|
| // Database manipulation methods.
|
| void RegisterTrackerAsAppRoot(const std::string& app_id,
|
| - int64 tracker_id,
|
| - leveldb::WriteBatch* batch);
|
| + int64 tracker_id);
|
|
|
| void CreateTrackerForParentAndFileID(const FileTracker& parent_tracker,
|
| - const std::string& file_id,
|
| - leveldb::WriteBatch* batch);
|
| + const std::string& file_id);
|
| void CreateTrackerForParentAndFileMetadata(const FileTracker& parent_tracker,
|
| const FileMetadata& file_metadata,
|
| - UpdateOption option,
|
| - leveldb::WriteBatch* batch);
|
| + UpdateOption option);
|
| void CreateTrackerInternal(const FileTracker& parent_tracker,
|
| const std::string& file_id,
|
| const FileDetails* details,
|
| - UpdateOption option,
|
| - leveldb::WriteBatch* batch);
|
| + UpdateOption option);
|
|
|
| void MaybeAddTrackersForNewFile(const FileMetadata& file,
|
| - UpdateOption option,
|
| - leveldb::WriteBatch* batch);
|
| + UpdateOption option);
|
|
|
| - int64 IncrementTrackerID(leveldb::WriteBatch* batch);
|
| + int64 IncrementTrackerID();
|
|
|
| bool CanActivateTracker(const FileTracker& tracker);
|
| bool ShouldKeepDirty(const FileTracker& tracker) const;
|
| @@ -390,30 +384,24 @@ class MetadataDatabase {
|
| bool HasActiveTrackerForPath(int64 parent_tracker,
|
| const std::string& title) const;
|
|
|
| - void RemoveUnneededTrackersForMissingFile(const std::string& file_id,
|
| - leveldb::WriteBatch* batch);
|
| + void RemoveUnneededTrackersForMissingFile(const std::string& file_id);
|
| void UpdateByFileMetadata(const tracked_objects::Location& from_where,
|
| scoped_ptr<FileMetadata> file,
|
| - UpdateOption option,
|
| - leveldb::WriteBatch* batch);
|
| + UpdateOption option);
|
|
|
| - void WriteToDatabase(scoped_ptr<leveldb::WriteBatch> batch,
|
| - const SyncStatusCallback& callback);
|
| + void WriteToDatabase(const SyncStatusCallback& callback);
|
|
|
| bool HasNewerFileMetadata(const std::string& file_id, int64 change_id);
|
|
|
| scoped_ptr<base::ListValue> DumpTrackers();
|
| scoped_ptr<base::ListValue> DumpMetadata();
|
|
|
| - void AttachSyncRoot(const google_apis::FileResource& sync_root_folder,
|
| - leveldb::WriteBatch* batch);
|
| - void AttachInitialAppRoot(const google_apis::FileResource& app_root_folder,
|
| - leveldb::WriteBatch* batch);
|
| + void AttachSyncRoot(const google_apis::FileResource& sync_root_folder);
|
| + void AttachInitialAppRoot(const google_apis::FileResource& app_root_folder);
|
|
|
| void ForceActivateTrackerByPath(int64 parent_tracker_id,
|
| const std::string& title,
|
| - const std::string& file_id,
|
| - leveldb::WriteBatch* batch);
|
| + const std::string& file_id);
|
|
|
| void DetachFromSequence();
|
|
|
| @@ -421,7 +409,7 @@ class MetadataDatabase {
|
| scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
|
| base::FilePath database_path_;
|
| leveldb::Env* env_override_;
|
| - scoped_ptr<leveldb::DB> db_;
|
| + scoped_ptr<LevelDBWrapper> db_;
|
|
|
| int64 largest_known_change_id_;
|
|
|
|
|