chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc - Issue 611323003: [SyncFS] Fix backgrounding race of ConflictResolver

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 611323003: [SyncFS] Fix backgrounding race of ConflictResolver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@demotion

Patch Set: Created 6 years, 3 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/conflict_resolver.cc

diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

index a4413978b48efe438241b1e6479ca2742ad6aa79..c2372f40bcb4925eabb642ec90f57b37467b5295 100644

--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

@@ -49,8 +49,7 @@ void ConflictResolver::RunExclusive(scoped_ptr<SyncTaskToken> token) {

// Conflict resolution should be invoked on clean tree.

if (metadata_database()->HasDirtyTracker()) {

- NOTREACHED();

- SyncTaskManager::NotifyTaskDone(token.Pass(), SYNC_STATUS_FAILED);

+ SyncTaskManager::NotifyTaskDone(token.Pass(), SYNC_STATUS_RETRY);

return;

}

« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/sync_worker.cc » ('j') | no next file with comments »