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

Unified Diff: chrome/browser/sync_file_system/drive_file_sync_service.cc

Issue 13372002: Uninstall a non-syncfs extension should not cause Token loss (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 9 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/drive_file_sync_service.cc
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_file_sync_service.cc
index a7666fdea7ea226add48b826c3ee8e84539c750f..386160a1a8aa023c2ca02e2470d820c9dd1d32cd 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc
@@ -500,9 +500,12 @@ void DriveFileSyncService::UninstallOrigin(
// An empty resource_id indicates either one of following two cases:
// 1) origin is not in metadata_store_ because the extension was never
- // run and thus no origin directory on the remote drive was created.
+ // run or it's not managed by this service, and thus no
+ // origin directory on the remote drive was created.
// 2) origin or sync root folder is deleted on Drive.
if (resource_id.empty()) {
+ token->ResetTask(FROM_HERE);
+ NotifyTaskDone(last_operation_status_, token.Pass());
callback.Run(SYNC_STATUS_OK);
return;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698