[SyncFS] Make MetadataDatabase operations synchronous

chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "chrome/browser/drive/drive_api_service.h"
@@ skipping 67 matching lines @@
   DCHECK(sync_context_->GetDriveService());
 
   // The metadata seems to have been already initialized. Just return with OK.
   if (sync_context_->GetMetadataDatabase()) {
     util::Log(logging::LOG_VERBOSE, FROM_HERE,
               "[Initialize] Already initialized.");
     SyncTaskManager::NotifyTaskDone(token.Pass(), SYNC_STATUS_OK);
     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);
+  // TODO(tzik): Expand this function.
+  DidCreateMetadataDatabase(token.Pass(), status, metadata_database.Pass());
 }
 
 scoped_ptr<MetadataDatabase> SyncEngineInitializer::PassMetadataDatabase() {
   return metadata_database_.Pass();
 }
 
 void SyncEngineInitializer::DidCreateMetadataDatabase(
     scoped_ptr<SyncTaskToken> token,
     SyncStatusCode status,
     scoped_ptr<MetadataDatabase> instance) {
@@ skipping 236 matching lines @@
                        weak_ptr_factory_.GetWeakPtr(), base::Passed(&token)));
     return;
   }
 
   PopulateDatabase(token.Pass());
 }
 
 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_);
+  // TODO(tzik): Expand this function.
+  DidPopulateDatabase(token.Pass(), status);
 }
 
 void SyncEngineInitializer::DidPopulateDatabase(
     scoped_ptr<SyncTaskToken> token,
     SyncStatusCode status) {
   if (status != SYNC_STATUS_OK) {
     util::Log(logging::LOG_VERBOSE, FROM_HERE,
               "[Initialize] Failed to populate initial data"
               " to MetadataDatabase.");
     SyncTaskManager::NotifyTaskDone(token.Pass(), status);
     return;
   }
 
   util::Log(logging::LOG_VERBOSE, FROM_HERE,
             "[Initialize] Completed successfully.");
   SyncTaskManager::NotifyTaskDone(token.Pass(), SYNC_STATUS_OK);
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system