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

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

Issue 243583005: Revert of [SyncFS] Post tasks between SyncEngine and SyncWorker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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/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 1b6f950659594b1ed0e3ca0523cc6e35811af490..9cdbbf1dafad69f39bcc36c0d612284815f5c592 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
@@ -72,20 +72,20 @@
new drive::DriveUploader(drive_service.get(),
file_task_runner_.get()));
- fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
- drive_service.get(), uploader.get(),
- kSyncRootFolderTitle));
-
remote_sync_service_.reset(new SyncEngine(
drive_service.PassAs<drive::DriveServiceInterface>(),
uploader.Pass(),
- file_task_runner_.get(),
NULL, NULL, NULL));
remote_sync_service_->AddServiceObserver(this);
- remote_sync_service_->Initialize(base_dir_.path(),
- base::MessageLoopProxy::current(),
- in_memory_env_.get());
+ remote_sync_service_->Initialize(
+ base_dir_.path(),
+ file_task_runner_.get(),
+ in_memory_env_.get());
remote_sync_service_->SetSyncEnabled(true);
+
+ fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
+ fake_drive_service(), drive_uploader(),
+ kSyncRootFolderTitle));
local_sync_service_->SetLocalChangeProcessor(remote_sync_service_.get());
remote_sync_service_->SetRemoteChangeProcessor(local_sync_service_.get());
@@ -464,6 +464,10 @@
remote_sync_service_->GetDriveService());
}
+ drive::DriveUploaderInterface* drive_uploader() {
+ return remote_sync_service_->GetDriveUploader();
+ }
+
FakeDriveServiceHelper* fake_drive_service_helper() {
return fake_drive_service_helper_.get();
}

Powered by Google App Engine
This is Rietveld 408576698