Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(955)

Unified Diff: chrome/browser/sync_file_system/drive_backend/metadata_database.cc

Issue 393953010: [SyncFS] Migrate version management from MDDB to index classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync_file_system/drive_backend/metadata_database.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
index 110acc686bb499ba36b92e1fa04bde517466aef4..f0f0c10ab4c5122c73ed7b085613f466eb613970 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
@@ -284,15 +284,6 @@ SyncStatusCode MigrateDatabaseIfNeeded(leveldb::DB* db) {
}
}
-SyncStatusCode WriteVersionInfo(leveldb::DB* db) {
- base::ThreadRestrictions::AssertIOAllowed();
- DCHECK(db);
- return LevelDBStatusToSyncStatusCode(
- db->Put(leveldb::WriteOptions(),
- kDatabaseVersionKey,
- base::Int64ToString(kCurrentDatabaseVersion)));
-}
-
bool HasInvalidTitle(const std::string& title) {
return title.empty() ||
title.find('/') != std::string::npos ||
@@ -1479,11 +1470,7 @@ SyncStatusCode MetadataDatabase::InitializeOnFileTaskRunner() {
return status;
}
- if (created) {
- status = WriteVersionInfo(db_.get());
- if (status != SYNC_STATUS_OK)
- return status;
- } else {
+ if (!created) {
status = MigrateDatabaseIfNeeded(db_.get());
if (status != SYNC_STATUS_OK)
return status;

Powered by Google App Engine
This is Rietveld 408576698