GitLab

This reverts commit a445460b.

Reason for revert:

MSAN warning in USS/TwoClientBookmarksSyncTestIncludingUssTests.CreateSyncedBookmarks

See:
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Linux%20MSan%20Tests/11051
https://chromium-swarm.appspot.com/task?id=3f17cf427082ec10&refresh=10&show_raw=1

Original change's description:
> Reland "[Sync::USS] Bookmark sync conflict resolution"
>
> 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/1161861
> Reviewed-by: Mikel Astiz <mastiz@chromium.org>
> Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#580496}

TBR=mastiz@chromium.org,mamir@chromium.org

Change-Id: I22a2a0f518fdbefe7baa3c4840884090459e62a3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 516866, 870668
Reviewed-on: https://chromium-review.googlesource.com/1161884
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580509}