Revert of Restrict affiliaton-based matching to when sync without a custom passphrase...
commit1f3cf686b7e5ffcbf867b3f3775ba83b79fbf504
authorhendrikw <hendrikw@chromium.org>
Tue, 14 Apr 2015 14:34:30 +0000 (14 07:34 -0700)
committerCommit bot <commit-bot@chromium.org>
Tue, 14 Apr 2015 14:34:47 +0000 (14 14:34 +0000)
treebbd7c3736a6b1f9a23d6442363db4462d112fcb4
parentbf4406a751ad5cf35e931cb834aad4d29bd82175
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}
chrome/browser/password_manager/password_store_factory.cc
chrome/browser/password_manager/password_store_factory.h
chrome/browser/sync/glue/password_data_type_controller.cc
chrome/browser/sync/glue/password_data_type_controller.h
components/password_manager/core/browser/password_store.cc
components/password_manager/core/browser/password_store.h