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

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

Issue 407073003: [SyncFS] Add completion callback to PromoteDemotedChanges (1/3) (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
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
index ae22a0944e65b97a454c76b2acb82decd0e8599b..cf7da82f94927cec8778b977d1472d0c966af0f9 100644
--- a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
@@ -356,8 +356,18 @@ class DriveBackendSyncTest : public testing::Test,
if (local_sync_status == SYNC_STATUS_NO_CHANGE_TO_SYNC &&
remote_sync_status == SYNC_STATUS_NO_CHANGE_TO_SYNC) {
- remote_sync_service_->PromoteDemotedChanges();
- local_sync_service_->PromoteDemotedChanges();
+
+ {
+ base::RunLoop run_loop;
+ remote_sync_service_->PromoteDemotedChanges(run_loop.QuitClosure());
+ run_loop.Run();
+ }
+
+ {
+ base::RunLoop run_loop;
+ local_sync_service_->PromoteDemotedChanges(run_loop.QuitClosure());
+ run_loop.Run();
+ }
if (pending_remote_changes_ || pending_local_changes_)
continue;
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698