GitLab

This fixes a bug that was introduced with 13ef1e88
While the first patch properly distinguished between the two when processing
local changes it failed doing so when processing remote changes (either
incremental or initial sync changes).

The issue surfaced when a preference got moved between regular and priority
sync preferences. In that scenario, sync has values for that pref in each
flavour and one can overwrite the other.

Bug: 849523, 840332
Change-Id: Ib458c5863bc036dbb2a735ccacd52c6df2c118bb
Reviewed-on: https://chromium-review.googlesource.com/1099381Reviewed-by: Dominic Battré <battre@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Commit-Queue: Tim Schumann <tschumann@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567255}