Revert of Restrict affiliaton-based matching to when sync without a custom passphrase is enabled. (patchset #5 id:100001 of https://codereview.chromium.org/
1075073006/)
Reason for revert:
GPU FYI build failure, Please see https://code.google.com/p/chromium/issues/detail?id=476942
Original issue's description:
> Restrict affiliaton-based matching to be enabled only when sync without a custom passphrase is enabled.
>
> BUG=437865
>
> Committed: https://crrev.com/
e60831f0d36f9691256a42d19689ffbcfcb8e13f
> Cr-Commit-Position: refs/heads/master@{#325016}
TBR=atwilson@chromium.org,zea@chromium.org,mkwst@chromium.org,engedy@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=437865
Review URL: https://codereview.chromium.org/
1087833003
Cr-Commit-Position: refs/heads/master@{#325041}