Move ShouldFilterAutofillResult from ChromePasswordManagerClient to PasswordManager

chrome/browser/password_manager/chrome_password_manager_client.h

Index: chrome/browser/password_manager/chrome_password_manager_client.h
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h
index f909000030db5070953c36e29d34c63f0f5c8f48..e5c2fc20695aed0322872b95052ff2934a128ca2 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -7,6 +7,8 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "base/prefs/pref_member.h"
 #include "components/password_manager/content/browser/content_password_manager_driver_factory.h"
 #include "components/password_manager/content/browser/credential_manager_dispatcher.h"
@@ -45,11 +47,9 @@ class ChromePasswordManagerClient
   bool IsAutomaticPasswordSavingEnabled() const override;
   bool IsPasswordManagementEnabledForCurrentPage() const override;
   bool IsSavingEnabledForCurrentPage() const override;
-  bool ShouldFilterAutofillResult(const autofill::PasswordForm& form) override;
   std::string GetSyncUsername() const override;
   bool IsSyncAccountCredential(const std::string& username,
                                const std::string& realm) const override;
-  void AutofillResultsComputed() override;
   bool PromptUserToSaveOrUpdatePassword(
       scoped_ptr<password_manager::PasswordFormManager> form_to_save,
       password_manager::CredentialSourceType type,
@@ -82,6 +82,9 @@ class ChromePasswordManagerClient
   autofill::AutofillManager* GetAutofillManagerForMainFrame() override;
   const GURL& GetMainFrameURL() const override;
   bool IsUpdatePasswordUIEnabled() const override;
+  const GURL& GetLastCommittedEntryURL() const override;
+  scoped_ptr<password_manager::StoreResultFilter> CreateStoreResultFilter()
+      const override;
 
   // Hides any visible generation UI.
   void HidePasswordGenerationPopup();
@@ -106,12 +109,6 @@ class ChromePasswordManagerClient
                               autofill::AutofillClient* autofill_client);
 
  private:
-  enum AutofillForSyncCredentialsState {
-    ALLOW_SYNC_CREDENTIALS,
-    DISALLOW_SYNC_CREDENTIALS_FOR_REAUTH,
-    DISALLOW_SYNC_CREDENTIALS,
-  };
-
   friend class content::WebContentsUserData<ChromePasswordManagerClient>;
 
   // content::WebContentsObserver overrides.
@@ -139,17 +136,10 @@ class ChromePasswordManagerClient
   // |can_use_log_router_|.
   void NotifyRendererOfLoggingAvailability();
 
-  // Returns true if the last loaded page was for transactional re-auth on a
-  // Google property.
-  bool LastLoadWasTransactionalReauthPage() const;
-
   // Returns true if |url| is the reauth page for accessing the password
   // website.
   bool IsURLPasswordWebsiteReauth(const GURL& url) const;
 
-  // Sets |autofill_state_| based on experiment and flag values.
-  void SetUpAutofillSyncState();
-
   Profile* const profile_;
 
   password_manager::PasswordManager password_manager_;
@@ -169,13 +159,6 @@ class ChromePasswordManagerClient
   // True if |this| is registered with some LogRouter which can accept logs.
   bool can_use_log_router_;
 
-  // How to handle the sync credential in ShouldFilterAutofillResult().
-  AutofillForSyncCredentialsState autofill_sync_state_;
-
-  // If the sync credential was filtered during autofill. Used for statistics
-  // reporting.
-  bool sync_credential_was_filtered_;
-
   // Set to false to disable password saving (will no longer ask if you
   // want to save passwords but will continue to fill passwords).
   BooleanPrefMember saving_passwords_enabled_;