commit bd045838187c8a35dd28c16fb13a9f63a6faae66
author Mohamed Amir Yosef <mamir@chromium.org> Thu Jan 10 14:03:39 2019
committer Commit Bot <commit-bot@chromium.org> Thu Jan 10 14:03:39 2019
tree c08dc5b5458cb232d941e8a94ec5836f1537b84f
parent 176f1b6a41bbf0144d94ad58443aa1804c389d85

[Sync::USS] Fix for bookmarks re-encryption if conflict with deletions

Before this patch the code would try to re-encrypt entities when there
is a conflict between local and remote deletions. In which case the
bookmark is dropped and hence the processor shouldn't try to re-encrypt
it.

In addition, this patch fixes a bug where the processor would
unnecessarily recommit entities with up to date encryption.
The processor wouldn't update the model type state until after
processing the remote updates. Therefore, the remote updates handler
would have out of date model type state and will falsely mark entities
having out of date encryption.

Bug: 516866
Change-Id: I039ff3fe2b0394aef26d1787b3861243dc68babf
Reviewed-on: https://chromium-review.googlesource.com/c/1402569
Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#621569}