GitLab

The patch reintroduces the logic reverted in
51be6f11, now behind a feature toggle.

switches::kMergeBookmarksUsingGUIDs is reused because actually there's
a fundamental coupling (which was overlooked before and the reason for
crashes): using deterministic tmp IDs *requires* that the merge
algorithm is aware of possible ID collisions (GUID equality).

Bug: 978430,1004205
Change-Id: I7babdcebc2d1eae4433c93316abdcbd374ceba19
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1878148Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709149}