GitLab

This reverts commit 0856d23e.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Reland "Reland "[Sync::USS] Bookmark sync conflict resolution""
> 
> This is a reland of a445460b
> because it was reverted by mistake.
> 
> TBR=mastiz@chromium.org
> 
> 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}
> 
> Bug: 516866
> Change-Id: I285dfa50ae5374bc82840b6d140f99f7edddd552
> Reviewed-on: https://chromium-review.googlesource.com/1162181
> Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
> Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#580553}

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

Change-Id: Ibd5c2c5ddd40a916dd8a2e04866ddedd46458da1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 516866
Reviewed-on: https://chromium-review.googlesource.com/1162841Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580676}