Index: chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc |
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc |
index d77676ccc0fa930d0da8d23663fb367700c05751..1bb3a94a5c53e38184e1f355aa164c8e98794e7e 100644 |
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc |
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc |
@@ -85,11 +85,10 @@ void SyncEngineInitializer::RunPreflight(scoped_ptr<SyncTaskToken> token) { |
return; |
} |
- MetadataDatabase::Create( |
- database_path_, |
- env_override_, |
- base::Bind(&SyncEngineInitializer::DidCreateMetadataDatabase, |
- weak_ptr_factory_.GetWeakPtr(), base::Passed(&token))); |
+ SyncStatusCode status = SYNC_STATUS_FAILED; |
+ scoped_ptr<MetadataDatabase> metadata_database = |
+ MetadataDatabase::Create(database_path_, env_override_, &status); |
+ DidCreateMetadataDatabase(token.Pass(), status, metadata_database.Pass()); |
peria
2014/09/10 00:24:15
Expand DidCreateMetadataDatabase() here.
tzik
2014/09/10 00:56:54
ditto
|
} |
scoped_ptr<MetadataDatabase> SyncEngineInitializer::PassMetadataDatabase() { |
@@ -346,12 +345,9 @@ void SyncEngineInitializer::DidListAppRootFolders( |
void SyncEngineInitializer::PopulateDatabase( |
scoped_ptr<SyncTaskToken> token) { |
DCHECK(sync_root_folder_); |
- metadata_database_->PopulateInitialData( |
- largest_change_id_, |
- *sync_root_folder_, |
- app_root_folders_, |
- base::Bind(&SyncEngineInitializer::DidPopulateDatabase, |
- weak_ptr_factory_.GetWeakPtr(), base::Passed(&token))); |
+ SyncStatusCode status = metadata_database_->PopulateInitialData( |
+ largest_change_id_, *sync_root_folder_, app_root_folders_); |
+ DidPopulateDatabase(token.Pass(), status); |
peria
2014/09/10 00:24:15
Expand DidPopulateDatabase() here.
tzik
2014/09/10 00:56:55
ditto
|
} |
void SyncEngineInitializer::DidPopulateDatabase( |