[SyncFS] Don't re-run conflict resolution on resolution error

[SyncFS] Don't re-run conflict resolution on resolution error

BUG=339327
R=kinuko@chromium.org, nhiroki@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247877

[tzik, 2014-01-30 04:05:38]

PTL

[nhiroki, 2014-01-30 04:24:35]

lgtm

https://codereview.chromium.org/149683008/diff/1/chrome/browser/sync_file_sys...
File chrome/browser/sync_file_system/drive_backend/sync_engine.cc (right):

https://codereview.chromium.org/149683008/diff/1/chrome/browser/sync_file_sys...
chrome/browser/sync_file_system/drive_backend/sync_engine.cc:593: void
SyncEngine::DidResolveConflict(SyncStatusCode status) {
How about having "DCHECK(!should_check_conflict_);" here?

[kinuko, 2014-01-30 04:46:24]

lgtm

[nhiroki, 2014-01-30 04:53:27]

https://codereview.chromium.org/149683008/diff/1/chrome/browser/sync_file_sys...
File chrome/browser/sync_file_system/drive_backend/sync_engine.cc (right):

https://codereview.chromium.org/149683008/diff/1/chrome/browser/sync_file_sys...
chrome/browser/sync_file_system/drive_backend/sync_engine.cc:593: void
SyncEngine::DidResolveConflict(SyncStatusCode status) {
On 2014/01/30 04:24:35, nhiroki wrote:
> How about having "DCHECK(!should_check_conflict_);" here?

Hmm... this seems overkill...? Anyway, your change looks reasonable. lgtm

[commit-bot: I haz the power, 2014-01-30 04:56:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tzik@chromium.org/149683008/1

[commit-bot: I haz the power, 2014-01-30 06:47:08]

Retried try job too often on android_dbg for step(s) slave_steps
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...

[tzik, 2014-01-30 07:40:53]

Committed patchset #1 manually as r247877 (presubmit successful).