SyncFS: Fix wrong conditional branch in ConflictResolver

BUG=240165
TEST=n/a (to be added in a separate CL)
R=tzik@chromium.org

Review URL: https://codereview.chromium.org/98223002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238026 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 238026