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

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

Issue 527163002: [SyncFS] Retry initialization of MetadataDatabase on failure of loading ServiceMetadata (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Retry initialization Created 6 years, 3 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_index.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc
index 4e0c10bcf4f189388c51eff9aa781190aae99be7..90fb183581af4e5b9c33796f2490a52dc65d72d5 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc
@@ -204,8 +204,10 @@ MetadataDatabaseIndex::Create(LevelDBWrapper* db) {
DCHECK(db);
scoped_ptr<ServiceMetadata> service_metadata = InitializeServiceMetadata(db);
- DatabaseContents contents;
+ if (!service_metadata)
+ return scoped_ptr<MetadataDatabaseIndex>();
+ DatabaseContents contents;
PutVersionToDB(kCurrentDatabaseVersion, db);
ReadDatabaseContents(db, &contents);
RemoveUnreachableItems(&contents,

Powered by Google App Engine
This is Rietveld 408576698