GitLab

This is a reland of 553ec6da

Original change's description:
> [Sync::USS] Bookmark sync conflict resolution
> 
> This patch addresses the problem of conflict in bookmarks upon
> receiving a remote update for a node that has local changes.
> 
> The general polic that is implemented is that server wins except in
> case of deletion.
> 
> Bug: 516866
> Change-Id: I50a85bde068dd9414e4e22bc1a33529fb3dfffa1
> Reviewed-on: https://chromium-review.googlesource.com/1157006
> Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
> Reviewed-by: Mikel Astiz <mastiz@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#580436}

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