[bookmarks] Don't prefer touch icons on iOS

This fixes bookmark sync, which can otherwise upload bookmarks without
favicons on iOS.

The change makes iOS consistent with the behavior on other platforms
(most notably Android) without influencing the UI, because it doesn't
read favicons from BookmarkModel.

Note also that this achieves symmetry with the sync download path,
where remote favicons are cached locally as regular (non-touch)
favicons. This means those favicons will be reused if the bookmark
changes locally, when the changes are sync-ed.

This patch also allows simplifying the bookmark layers because the
whole predicate is no longer used. This will be addressed in follow-up

Change-Id: I2632ff9ee73c1442528bb675cc671e7536789ffe
Bug: 1103191
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2287470
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Mark Cogan <marq@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#787161}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 1eb1d47188ab81eabbd002a5095555b1ff7f0dad
1 file changed