b47f7a11fe
In case when there are several entities having the same GUID and they have different types (one is a folder and another one is a URL), the folder will be preferred because it may contain more bookmarks. This patch fixes CHECK violation in SyncedBookmarkTracker::Add method during the initial merge due to duplicate entities (with the same GUID). Bug: 1081061 Change-Id: I45dd90d345c323a52b33d2fb5282a9b806a34f6a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2379728 Commit-Queue: Rushan Suleymanov <rushans@google.com> Reviewed-by: Mikel Astiz <mastiz@chromium.org> Cr-Commit-Position: refs/heads/master@{#803812}