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}

2 files changed, 5 insertions, 11 deletions

diff --git a/components/password_manager/core/browser/password_store.cc b/components/password_manager/core/browser/password_store.cc
index f4cd065..a10b7e8 100644
--- a/components/password_manager/core/browser/password_store.cc
+++ b/components/password_manager/core/browser/password_store.cc
@@ -75,13 +75,11 @@ bool PasswordStore::Init(const syncer::SyncableService::StartSyncFlare& flare) {
 
 void PasswordStore::SetAffiliatedMatchHelper(
     scoped_ptr<AffiliatedMatchHelper> helper) {
+  DCHECK(helper);
+  DCHECK(!affiliated_match_helper_);
   affiliated_match_helper_ = helper.Pass();
 }
 
-bool PasswordStore::HasAffiliatedMatchHelper() const {
-  return affiliated_match_helper_;
-}
-
 void PasswordStore::AddLogin(const PasswordForm& form) {
   CheckForEmptyUsernameAndPassword(form);
   ScheduleTask(base::Bind(&PasswordStore::AddLoginInternal, this, form));
diff --git a/components/password_manager/core/browser/password_store.h b/components/password_manager/core/browser/password_store.h
index 852a51e..b4ba7b4 100644
--- a/components/password_manager/core/browser/password_store.h
+++ b/components/password_manager/core/browser/password_store.h
@@ -68,15 +68,11 @@ class PasswordStore : protected PasswordStoreSync,
 
   // Sets the affiliation-based match |helper| that will be used by subsequent
   // GetLogins() calls to return credentials stored not only for the requested
-  // sign-on realm, but also for affiliated Android applications. If |helper| is
-  // null, clears the the currently set helper if any. Unless a helper is set,
-  // affiliation-based matching is disabled. The passed |helper| must already be
-  // initialized if it is non-null.
+  // sign-on realm, but also for affiliated Android applications. The helper
+  // must already be initialized. Unless a |helper| is set, affiliation-based
+  // matching is disabled.
   void SetAffiliatedMatchHelper(scoped_ptr<AffiliatedMatchHelper> helper);
 
-  // Returns whether or not an affiliation-based match helper is set.
-  bool HasAffiliatedMatchHelper() const;
-
   // Adds the given PasswordForm to the secure password store asynchronously.
   virtual void AddLogin(const autofill::PasswordForm& form);