[SyncFS] Make MetadataDatabase operations synchronous

chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.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/metadata_database.h"
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 184 matching lines @@
     TrackerIDSet trackers;
     if (metadata_database_->FindTrackersByFileID(file_id, &trackers)) {
       EXPECT_FALSE(trackers.empty());
       return *trackers.begin();
     }
     return 0;
   }
 
   SyncStatusCode InitializeMetadataDatabase() {
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
-    MetadataDatabase::Create(database_dir_.path(),
-                             in_memory_env_.get(),
-                             CreateResultReceiver(&status,
-                                                  &metadata_database_));
-    message_loop_.RunUntilIdle();
+    metadata_database_ = MetadataDatabase::Create(
+        database_dir_.path(), in_memory_env_.get(), &status);
     return status;
   }
 
   void DropDatabase() {
     metadata_database_.reset();
     message_loop_.RunUntilIdle();
   }
 
   void SetUpDatabaseByTrackedFiles(const TrackedFile** tracked_files,
                                    int size) {
@@ skipping 328 matching lines @@
     ASSERT_TRUE(metadata_database()->FindTrackerByTrackerID(
         tracker.tracker_id(), &tracker_in_metadata_database));
 
     SCOPED_TRACE("Expect equivalent tracker[" +
                  base::Int64ToString(tracker.tracker_id()) + "]");
     ExpectEquivalent(&tracker, &tracker_in_metadata_database);
   }
 
   SyncStatusCode RegisterApp(const std::string& app_id,
                              const std::string& folder_id) {
-    SyncStatusCode status = SYNC_STATUS_UNKNOWN;
-    metadata_database_->RegisterApp(
-        app_id, folder_id,
-        CreateResultReceiver(&status));
-    message_loop_.RunUntilIdle();
-    return status;
+    return metadata_database_->RegisterApp(app_id, folder_id);
   }
 
   SyncStatusCode DisableApp(const std::string& app_id) {
-    SyncStatusCode status = SYNC_STATUS_UNKNOWN;
-    metadata_database_->DisableApp(
-        app_id, CreateResultReceiver(&status));
-    message_loop_.RunUntilIdle();
-    return status;
+    return metadata_database_->DisableApp(app_id);
   }
 
   SyncStatusCode EnableApp(const std::string& app_id) {
-    SyncStatusCode status = SYNC_STATUS_UNKNOWN;
-    metadata_database_->EnableApp(
-        app_id, CreateResultReceiver(&status));
-    message_loop_.RunUntilIdle();
-    return status;
+    return metadata_database_->EnableApp(app_id);
   }
 
   SyncStatusCode UnregisterApp(const std::string& app_id) {
-    SyncStatusCode status = SYNC_STATUS_UNKNOWN;
-    metadata_database_->UnregisterApp(
-        app_id, CreateResultReceiver(&status));
-    message_loop_.RunUntilIdle();
-    return status;
+    return metadata_database_->UnregisterApp(app_id);
   }
 
   SyncStatusCode UpdateByChangeList(
       ScopedVector<google_apis::ChangeResource> changes) {
-    SyncStatusCode status = SYNC_STATUS_UNKNOWN;
-    metadata_database_->UpdateByChangeList(
-        current_change_id_,
-        changes.Pass(), CreateResultReceiver(&status));
-    message_loop_.RunUntilIdle();
-    return status;
+    return metadata_database_->UpdateByChangeList(
+        current_change_id_, changes.Pass());
   }
 
   SyncStatusCode PopulateFolder(const std::string& folder_id,
                                 const FileIDList& listed_children) {
-    SyncStatusCode status = SYNC_STATUS_UNKNOWN;
-    metadata_database_->PopulateFolderByChildList(
-        folder_id, listed_children,
-        CreateResultReceiver(&status));
-    message_loop_.RunUntilIdle();
-    return status;
+    return metadata_database_->PopulateFolderByChildList(
+        folder_id, listed_children);
   }
 
   SyncStatusCode UpdateTracker(const FileTracker& tracker) {
-    SyncStatusCode status = SYNC_STATUS_UNKNOWN;
-    metadata_database_->UpdateTracker(
-        tracker.tracker_id(), tracker.synced_details(),
-        CreateResultReceiver(&status));
-    message_loop_.RunUntilIdle();
-    return status;
+    return metadata_database_->UpdateTracker(
+        tracker.tracker_id(), tracker.synced_details());
   }
 
   SyncStatusCode PopulateInitialData(
       int64 largest_change_id,
       const google_apis::FileResource& sync_root_folder,
       const ScopedVector<google_apis::FileResource>& app_root_folders) {
-    SyncStatusCode status = SYNC_STATUS_UNKNOWN;
-    metadata_database_->PopulateInitialData(
-        largest_change_id,
-        sync_root_folder,
-        app_root_folders,
-        CreateResultReceiver(&status));
-    message_loop_.RunUntilIdle();
-    return status;
+    return metadata_database_->PopulateInitialData(
+        largest_change_id, sync_root_folder, app_root_folders);
   }
 
   void ResetTrackerID(FileTracker* tracker) {
     tracker->set_tracker_id(GetTrackerIDByFileID(tracker->file_id()));
   }
 
   int64 current_change_id() const {
     return current_change_id_;
   }
 
@@ skipping 542 matching lines @@
   EXPECT_TRUE(file->HasKey("details"));
 
   ASSERT_TRUE(files->GetDictionary(1, &file));
   EXPECT_TRUE(file->GetString("title", &str) && str == "file_0");
   EXPECT_TRUE(file->GetString("type", &str) && str == "file");
   EXPECT_TRUE(file->HasKey("details"));
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system