Remove remaining autofill password authentication code.

This reverts the rest of code from crbug.com/341492

BUG=421254

Review URL: https://codereview.chromium.org/650453002

Cr-Commit-Position: refs/heads/master@{#299539}

19 files changed, 21 insertions, 104 deletions

diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
index f10d487..f601653 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -69,8 +69,7 @@ ChromePasswordManagerClient::ChromePasswordManagerClient(
       observer_(NULL),
       can_use_log_router_(false),
       autofill_sync_state_(ALLOW_SYNC_CREDENTIALS),
-      sync_credential_was_filtered_(false),
-      weak_factory_(this) {
+      sync_credential_was_filtered_(false) {
   PasswordManagerInternalsService* service =
       PasswordManagerInternalsServiceFactory::GetForBrowserContext(profile_);
   if (service)
@@ -197,11 +196,6 @@ void ChromePasswordManagerClient::PasswordAutofillWasBlocked(
     controller->OnBlacklistBlockedAutofill(best_matches);
 }
 
-void ChromePasswordManagerClient::AuthenticateAutofillAndFillForm(
-      scoped_ptr<autofill::PasswordFormFillData> fill_data) {
-  CommitFillPasswordForm(fill_data.get());
-}
-
 void ChromePasswordManagerClient::HidePasswordGenerationPopup() {
   if (popup_controller_)
     popup_controller_->HideAndDestroy();
@@ -388,11 +382,6 @@ void ChromePasswordManagerClient::NotifyRendererOfLoggingAvailability() {
       can_use_log_router_));
 }
 
-void ChromePasswordManagerClient::CommitFillPasswordForm(
-    autofill::PasswordFormFillData* data) {
-  driver_.FillPasswordForm(*data);
-}
-
 bool ChromePasswordManagerClient::LastLoadWasTransactionalReauthPage() const {
   DCHECK(web_contents());
   content::NavigationEntry* entry =
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h
index 61f2644..1060151 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -56,8 +56,6 @@ class ChromePasswordManagerClient
       const autofill::PasswordFormMap& best_matches) const override;
   virtual void PasswordAutofillWasBlocked(
       const autofill::PasswordFormMap& best_matches) const override;
-  virtual void AuthenticateAutofillAndFillForm(
-      scoped_ptr<autofill::PasswordFormFillData> fill_data) override;
   virtual PrefService* GetPrefs() override;
   virtual password_manager::PasswordStore* GetPasswordStore() override;
   virtual password_manager::PasswordManagerDriver* GetDriver() override;
@@ -112,11 +110,6 @@ class ChromePasswordManagerClient
   // content::WebContentsObserver overrides.
   virtual bool OnMessageReceived(const IPC::Message& message) override;
 
-  // Callback method to be triggered when authentication is successful for a
-  // given password authentication request.  If authentication is disabled or
-  // not supported, this will be triggered directly.
-  void CommitFillPasswordForm(autofill::PasswordFormFillData* fill_data);
-
   // Given |bounds| in the renderers coordinate system, return the same bounds
   // in the screens coordinate system.
   gfx::RectF GetBoundsInScreenSpace(const gfx::RectF& bounds);
@@ -171,9 +164,6 @@ class ChromePasswordManagerClient
   // reporting.
   bool sync_credential_was_filtered_;
 
-  // Allows authentication callbacks to be destroyed when this client is gone.
-  base::WeakPtrFactory<ChromePasswordManagerClient> weak_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(ChromePasswordManagerClient);
 };
 
diff --git a/components/autofill/content/common/autofill_param_traits_macros.h b/components/autofill/content/common/autofill_param_traits_macros.h
index 572ef3a..20a7779 100644
--- a/components/autofill/content/common/autofill_param_traits_macros.h
+++ b/components/autofill/content/common/autofill_param_traits_macros.h
@@ -45,8 +45,6 @@ IPC_STRUCT_TRAITS_BEGIN(autofill::PasswordForm)
   IPC_STRUCT_TRAITS_MEMBER(type)
   IPC_STRUCT_TRAITS_MEMBER(times_used)
   IPC_STRUCT_TRAITS_MEMBER(form_data)
-  // Excluding |use_additional_authentication| as it is only set and read in the
-  // browser process and the renderer need not know about it.
 IPC_STRUCT_TRAITS_END()
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_COMMON_AUTOFILL_PARAM_TRAITS_MACROS_H_
diff --git a/components/autofill/content/renderer/password_form_conversion_utils.cc b/components/autofill/content/renderer/password_form_conversion_utils.cc
index 538b602..aecad23 100644
--- a/components/autofill/content/renderer/password_form_conversion_utils.cc
+++ b/components/autofill/content/renderer/password_form_conversion_utils.cc
@@ -240,7 +240,6 @@ void GetPasswordForm(const WebFormElement& form, PasswordForm* password_form) {
   password_form->preferred = false;
   password_form->blacklisted_by_user = false;
   password_form->type = PasswordForm::TYPE_MANUAL;
-  password_form->use_additional_authentication = false;
 }
 
 }  // namespace
diff --git a/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc b/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc
index af70d22..91769ec 100644
--- a/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc
+++ b/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc
@@ -165,7 +165,6 @@ TEST_F(PasswordFormConversionUtilsTest, BasicFormAttributes) {
   EXPECT_FALSE(password_form->preferred);
   EXPECT_FALSE(password_form->blacklisted_by_user);
   EXPECT_EQ(PasswordForm::TYPE_MANUAL, password_form->type);
-  EXPECT_FALSE(password_form->use_additional_authentication);
 }
 
 TEST_F(PasswordFormConversionUtilsTest, DisabledFieldsAreIgnored) {
diff --git a/components/autofill/core/common/password_form.cc b/components/autofill/core/common/password_form.cc
index 3730273..0f3ee64 100644
--- a/components/autofill/core/common/password_form.cc
+++ b/components/autofill/core/common/password_form.cc
@@ -18,7 +18,6 @@ PasswordForm::PasswordForm()
       blacklisted_by_user(false),
       type(TYPE_MANUAL),
       times_used(0),
-      use_additional_authentication(false),
       is_zero_click(false) {
 }
 
@@ -49,7 +48,6 @@ bool PasswordForm::operator==(const PasswordForm& form) const {
       blacklisted_by_user == form.blacklisted_by_user &&
       type == form.type &&
       times_used == form.times_used &&
-      use_additional_authentication == form.use_additional_authentication &&
       form_data == form.form_data &&
       display_name == form.display_name &&
       avatar_url == form.avatar_url &&
@@ -83,8 +81,6 @@ std::ostream& operator<<(std::ostream& os, const PasswordForm& form) {
             << " date_synced: " << form.date_synced.ToDoubleT()
             << " type: " << form.type
             << " times_used: " << form.times_used
-            << " use additional authentication: "
-            << form.use_additional_authentication
             << " form_data: " << form.form_data
             << " display_name: " << base::UTF16ToUTF8(form.display_name)
             << " avatar_url: " << form.avatar_url
diff --git a/components/autofill/core/common/password_form.h b/components/autofill/core/common/password_form.h
index 5b4fc3d..becf0b2 100644
--- a/components/autofill/core/common/password_form.h
+++ b/components/autofill/core/common/password_form.h
@@ -193,12 +193,6 @@ struct PasswordForm {
   // When parsing an HTML form, this is not used.
   int times_used;
 
-  // True if additional system level authentication should be used
-  // (if available) before using this password for autofill.
-  //
-  // Default to false.
-  bool use_additional_authentication;
-
   // Autofill representation of this form. Used to communicate with the
   // Autofill servers if necessary. Currently this is only used to help
   // determine forms where we can trigger password generation.
diff --git a/components/autofill/core/common/save_password_progress_logger.cc b/components/autofill/core/common/save_password_progress_logger.cc
index bb852de..034760b 100644
--- a/components/autofill/core/common/save_password_progress_logger.cc
+++ b/components/autofill/core/common/save_password_progress_logger.cc
@@ -71,8 +71,6 @@ std::string GetStringFromID(SavePasswordProgressLogger::StringID id) {
       return "Password generated";
     case SavePasswordProgressLogger::STRING_TIMES_USED:
       return "Times used";
-    case SavePasswordProgressLogger::STRING_USE_ADDITIONAL_AUTHENTICATION:
-      return "Use additional authentication";
     case SavePasswordProgressLogger::STRING_PSL_MATCH:
       return "PSL match";
     case SavePasswordProgressLogger::STRING_NAME_OR_ID:
@@ -251,8 +249,6 @@ void SavePasswordProgressLogger::LogPasswordForm(
   log.SetBoolean(GetStringFromID(STRING_PASSWORD_GENERATED),
                  form.type == PasswordForm::TYPE_GENERATED);
   log.SetInteger(GetStringFromID(STRING_TIMES_USED), form.times_used);
-  log.SetBoolean(GetStringFromID(STRING_USE_ADDITIONAL_AUTHENTICATION),
-                 form.use_additional_authentication);
   log.SetBoolean(GetStringFromID(STRING_PSL_MATCH), form.IsPublicSuffixMatch());
   LogValue(label, log);
 }
diff --git a/components/autofill/core/common/save_password_progress_logger.h b/components/autofill/core/common/save_password_progress_logger.h
index 99276ac..5341810 100644
--- a/components/autofill/core/common/save_password_progress_logger.h
+++ b/components/autofill/core/common/save_password_progress_logger.h
@@ -54,7 +54,6 @@ class SavePasswordProgressLogger {
     STRING_SSL_VALID,
     STRING_PASSWORD_GENERATED,
     STRING_TIMES_USED,
-    STRING_USE_ADDITIONAL_AUTHENTICATION,
     STRING_PSL_MATCH,
     STRING_NAME_OR_ID,
     STRING_MESSAGE,
diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc
index e2ebfc5..050bf8a 100644
--- a/components/password_manager/core/browser/login_database.cc
+++ b/components/password_manager/core/browser/login_database.cc
@@ -25,7 +25,7 @@ using autofill::PasswordForm;
 
 namespace password_manager {
 
-static const int kCurrentVersionNumber = 7;
+static const int kCurrentVersionNumber = 8;
 static const int kCompatibleVersionNumber = 1;
 
 Pickle SerializeVector(const std::vector<base::string16>& vec) {
@@ -68,7 +68,6 @@ enum LoginTableColumns {
   COLUMN_POSSIBLE_USERNAMES,
   COLUMN_TIMES_USED,
   COLUMN_FORM_DATA,
-  COLUMN_USE_ADDITIONAL_AUTH,
   COLUMN_DATE_SYNCED,
   COLUMN_DISPLAY_NAME,
   COLUMN_AVATAR_URL,
@@ -104,7 +103,6 @@ void BindAddStatement(const PasswordForm& form,
   s->BindBlob(COLUMN_FORM_DATA,
               form_data_pickle.data(),
               form_data_pickle.size());
-  s->BindInt(COLUMN_USE_ADDITIONAL_AUTH, form.use_additional_authentication);
   s->BindInt64(COLUMN_DATE_SYNCED, form.date_synced.ToInternalValue());
   s->BindString16(COLUMN_DISPLAY_NAME, form.display_name);
   s->BindString(COLUMN_AVATAR_URL, form.avatar_url.spec());
@@ -226,6 +224,13 @@ bool LoginDatabase::MigrateOldVersionsAsNeeded() {
       }
       meta_table_.SetVersionNumber(7);
       // Fall through.
+    case 7:
+      if (!db_.Execute(
+          "ALTER TABLE logins DROP COLUMN use_additional_auth")) {
+        return false;
+      }
+      meta_table_.SetVersionNumber(8);
+      // Fall through.
     case kCurrentVersionNumber:
       // Already up to date
       return true;
@@ -255,7 +260,6 @@ bool LoginDatabase::InitLoginsTable() {
                      "possible_usernames BLOB,"
                      "times_used INTEGER,"
                      "form_data BLOB,"
-                     "use_additional_auth INTEGER,"
                      "date_synced INTEGER,"
                      "display_name VARCHAR,"
                      "avatar_url VARCHAR,"
@@ -365,9 +369,9 @@ PasswordStoreChangeList LoginDatabase::AddLogin(const PasswordForm& form) {
       " password_element, password_value, submit_element, "
       " signon_realm, ssl_valid, preferred, date_created, blacklisted_by_user, "
       " scheme, password_type, possible_usernames, times_used, form_data, "
-      " use_additional_auth, date_synced, display_name, avatar_url,"
+      " date_synced, display_name, avatar_url,"
       " federation_url, is_zero_click) VALUES "
-      "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"));
+      "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"));
   BindAddStatement(form, encrypted_password, &s);
   db_.set_error_callback(base::Bind(&AddCallback));
   const bool success = s.Run();
@@ -383,9 +387,9 @@ PasswordStoreChangeList LoginDatabase::AddLogin(const PasswordForm& form) {
       " password_element, password_value, submit_element, "
       " signon_realm, ssl_valid, preferred, date_created, blacklisted_by_user, "
       " scheme, password_type, possible_usernames, times_used, form_data, "
-      " use_additional_auth, date_synced, display_name, avatar_url,"
+      " date_synced, display_name, avatar_url,"
       " federation_url, is_zero_click) VALUES "
-      "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"));
+      "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"));
   BindAddStatement(form, encrypted_password, &s);
   if (s.Run()) {
     list.push_back(PasswordStoreChange(PasswordStoreChange::REMOVE, form));
@@ -553,8 +557,6 @@ LoginDatabase::EncryptionResult LoginDatabase::InitPasswordFormFromStatement(
     PickleIterator form_data_iter(form_data_pickle);
     autofill::DeserializeFormData(&form_data_iter, &form->form_data);
   }
-  form->use_additional_authentication =
-      (s.ColumnInt(COLUMN_USE_ADDITIONAL_AUTH) > 0);
   form->date_synced = base::Time::FromInternalValue(
       s.ColumnInt64(COLUMN_DATE_SYNCED));
   form->display_name = s.ColumnString16(COLUMN_DISPLAY_NAME);
@@ -573,7 +575,7 @@ bool LoginDatabase::GetLogins(const PasswordForm& form,
       "password_element, password_value, submit_element, "
       "signon_realm, ssl_valid, preferred, date_created, blacklisted_by_user, "
       "scheme, password_type, possible_usernames, times_used, form_data, "
-      "use_additional_auth, date_synced, display_name, avatar_url, "
+      "date_synced, display_name, avatar_url, "
       "federation_url, is_zero_click FROM logins WHERE signon_realm == ? ";
   sql::Statement s;
   const GURL signon_realm(form.signon_realm);
@@ -668,7 +670,7 @@ bool LoginDatabase::GetLoginsCreatedBetween(
       "password_element, password_value, submit_element, "
       "signon_realm, ssl_valid, preferred, date_created, blacklisted_by_user, "
       "scheme, password_type, possible_usernames, times_used, form_data, "
-      "use_additional_auth, date_synced, display_name, avatar_url, "
+      "date_synced, display_name, avatar_url, "
       "federation_url, is_zero_click FROM logins "
       "WHERE date_created >= ? AND date_created < ?"
       "ORDER BY origin_url"));
@@ -700,7 +702,7 @@ bool LoginDatabase::GetLoginsSyncedBetween(
       "password_element, password_value, submit_element, signon_realm, "
       "ssl_valid, preferred, date_created, blacklisted_by_user, "
       "scheme, password_type, possible_usernames, times_used, form_data, "
-      "use_additional_auth, date_synced, display_name, avatar_url, "
+      "date_synced, display_name, avatar_url, "
       "federation_url, is_zero_click FROM logins "
       "WHERE date_synced >= ? AND date_synced < ?"
       "ORDER BY origin_url"));
@@ -742,7 +744,7 @@ bool LoginDatabase::GetAllLoginsWithBlacklistSetting(
       "password_element, password_value, submit_element, "
       "signon_realm, ssl_valid, preferred, date_created, blacklisted_by_user, "
       "scheme, password_type, possible_usernames, times_used, form_data, "
-      "use_additional_auth, date_synced, display_name, avatar_url, "
+      "date_synced, display_name, avatar_url, "
       "federation_url, is_zero_click FROM logins "
       "WHERE blacklisted_by_user == ? ORDER BY origin_url"));
   s.BindInt(0, blacklisted ? 1 : 0);
diff --git a/components/password_manager/core/browser/password_form_manager.cc b/components/password_manager/core/browser/password_form_manager.cc
index 5bd25b6..4dd75b5 100644
--- a/components/password_manager/core/browser/password_form_manager.cc
+++ b/components/password_manager/core/browser/password_form_manager.cc
@@ -195,12 +195,6 @@ void PasswordFormManager::PermanentlyBlacklist() {
   SaveAsNewLogin(false);
 }
 
-void PasswordFormManager::SetUseAdditionalPasswordAuthentication(
-    bool use_additional_authentication) {
-  pending_credentials_.use_additional_authentication =
-      use_additional_authentication;
-}
-
 bool PasswordFormManager::IsNewLogin() {
   DCHECK_EQ(state_, POST_MATCHING_PHASE);
   return is_new_login_;
diff --git a/components/password_manager/core/browser/password_form_manager.h b/components/password_manager/core/browser/password_form_manager.h
index b8a440b..fce6f9c 100644
--- a/components/password_manager/core/browser/password_form_manager.h
+++ b/components/password_manager/core/browser/password_form_manager.h
@@ -121,11 +121,6 @@ class PasswordFormManager : public PasswordStoreConsumer {
   // TODO: Make this private once we switch to the new UI.
   void PermanentlyBlacklist();
 
-  // Sets whether the password form should use additional password
-  // authentication if available before being used for autofill.
-  void SetUseAdditionalPasswordAuthentication(
-      bool use_additional_authentication);
-
   // If the user has submitted observed_form_, provisionally hold on to
   // the submitted credentials until we are told by PasswordManager whether
   // or not the login was successful. |action| describes how we deal with
diff --git a/components/password_manager/core/browser/password_form_manager_unittest.cc b/components/password_manager/core/browser/password_form_manager_unittest.cc
index b78b974..6a81025 100644
--- a/components/password_manager/core/browser/password_form_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_form_manager_unittest.cc
@@ -107,10 +107,6 @@ class TestPasswordManagerClient : public StubPasswordManagerClient {
   virtual PrefService* GetPrefs() override { return &prefs_; }
   virtual PasswordStore* GetPasswordStore() override { return password_store_; }
   virtual PasswordManagerDriver* GetDriver() override { return &driver_; }
-  virtual void AuthenticateAutofillAndFillForm(
-      scoped_ptr<autofill::PasswordFormFillData> fill_data) override {
-    driver_.FillPasswordForm(*fill_data.get());
-  }
 
   void SetFormToFilter(const autofill::PasswordForm& form) {
     form_to_filter_ = form;
diff --git a/components/password_manager/core/browser/password_generation_manager_unittest.cc b/components/password_manager/core/browser/password_generation_manager_unittest.cc
index f60a5ad..917f502 100644
--- a/components/password_manager/core/browser/password_generation_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_generation_manager_unittest.cc
@@ -77,8 +77,6 @@ class TestPasswordManagerClient : public StubPasswordManagerClient {
   virtual PasswordStore* GetPasswordStore() override { return NULL; }
   virtual PrefService* GetPrefs() override { return prefs_.get(); }
   virtual PasswordManagerDriver* GetDriver() override { return &driver_; }
-  virtual void AuthenticateAutofillAndFillForm(
-      scoped_ptr<autofill::PasswordFormFillData> fill_data) override {}
   virtual bool IsPasswordSyncEnabled() override { return is_sync_enabled_; }
 
   void set_is_password_sync_enabled(bool enabled) {
diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
index aa5744e..8239459 100644
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -548,33 +548,18 @@ void PasswordManager::Autofill(const PasswordForm& form_for_autofill,
                                bool wait_for_username) const {
   PossiblyInitializeUsernamesExperiment(best_matches);
 
-  // TODO(tedchoc): Switch to only requesting authentication if the user is
-  //                acting on the autofilled forms (crbug.com/342594) instead
-  //                of on page load.
-  bool authentication_required = preferred_match.use_additional_authentication;
-  for (autofill::PasswordFormMap::const_iterator it = best_matches.begin();
-       !authentication_required && it != best_matches.end();
-       ++it) {
-    if (it->second->use_additional_authentication)
-      authentication_required = true;
-  }
-
   switch (form_for_autofill.scheme) {
     case PasswordForm::SCHEME_HTML: {
       // Note the check above is required because the observers_ for a non-HTML
       // schemed password form may have been freed, so we need to distinguish.
-      scoped_ptr<autofill::PasswordFormFillData> fill_data(
-          new autofill::PasswordFormFillData());
+      autofill::PasswordFormFillData fill_data;
       InitPasswordFormFillData(form_for_autofill,
                                best_matches,
                                &preferred_match,
                                wait_for_username,
                                OtherPossibleUsernamesEnabled(),
-                               fill_data.get());
-      if (authentication_required)
-        client_->AuthenticateAutofillAndFillForm(fill_data.Pass());
-      else
-        driver_->FillPasswordForm(*fill_data.get());
+                               &fill_data);
+      driver_->FillPasswordForm(fill_data);
       break;
     }
     default:
diff --git a/components/password_manager/core/browser/password_manager_client.h b/components/password_manager/core/browser/password_manager_client.h
index 2c49288..a9c73bc 100644
--- a/components/password_manager/core/browser/password_manager_client.h
+++ b/components/password_manager/core/browser/password_manager_client.h
@@ -7,7 +7,6 @@
 
 #include "base/metrics/field_trial.h"
 #include "components/autofill/core/common/password_form.h"
-#include "components/autofill/core/common/password_form_fill_data.h"
 #include "components/password_manager/core/browser/password_store.h"
 
 class PrefService;
@@ -75,11 +74,6 @@ class PasswordManagerClient {
   virtual void PasswordAutofillWasBlocked(
       const autofill::PasswordFormMap& best_matches) const {}
 
-  // Called to authenticate the autofill password data.  If authentication is
-  // successful, this should continue filling the form.
-  virtual void AuthenticateAutofillAndFillForm(
-      scoped_ptr<autofill::PasswordFormFillData> fill_data) = 0;
-
   // Gets prefs associated with this embedder.
   virtual PrefService* GetPrefs() = 0;
 
diff --git a/components/password_manager/core/browser/password_store_change.h b/components/password_manager/core/browser/password_store_change.h
index 1f09c78..2c36afe 100644
--- a/components/password_manager/core/browser/password_store_change.h
+++ b/components/password_manager/core/browser/password_store_change.h
@@ -42,9 +42,7 @@ class PasswordStoreChange {
            form().ssl_valid == other.form().ssl_valid &&
            form().preferred == other.form().preferred &&
            form().date_created == other.form().date_created &&
-           form().blacklisted_by_user == other.form().blacklisted_by_user &&
-           form().use_additional_authentication ==
-               other.form().use_additional_authentication;
+           form().blacklisted_by_user == other.form().blacklisted_by_user;
   }
 
  private:
diff --git a/components/password_manager/core/browser/stub_password_manager_client.cc b/components/password_manager/core/browser/stub_password_manager_client.cc
index 8e30f7c..b1cecac 100644
--- a/components/password_manager/core/browser/stub_password_manager_client.cc
+++ b/components/password_manager/core/browser/stub_password_manager_client.cc
@@ -30,9 +30,6 @@ bool StubPasswordManagerClient::PromptUserToSavePassword(
 void StubPasswordManagerClient::AutomaticPasswordSave(
     scoped_ptr<PasswordFormManager> saved_manager) {}
 
-void StubPasswordManagerClient::AuthenticateAutofillAndFillForm(
-    scoped_ptr<autofill::PasswordFormFillData> fill_data) {}
-
 PrefService* StubPasswordManagerClient::GetPrefs() { return NULL; }
 
 PasswordStore* StubPasswordManagerClient::GetPasswordStore() { return NULL; }
diff --git a/components/password_manager/core/browser/stub_password_manager_client.h b/components/password_manager/core/browser/stub_password_manager_client.h
index 4eb037b..4193979 100644
--- a/components/password_manager/core/browser/stub_password_manager_client.h
+++ b/components/password_manager/core/browser/stub_password_manager_client.h
@@ -26,8 +26,6 @@ class StubPasswordManagerClient : public PasswordManagerClient {
       scoped_ptr<PasswordFormManager> form_to_save) override;
   virtual void AutomaticPasswordSave(
       scoped_ptr<PasswordFormManager> saved_manager) override;
-  virtual void AuthenticateAutofillAndFillForm(
-      scoped_ptr<autofill::PasswordFormFillData> fill_data) override;
   virtual PrefService* GetPrefs() override;
   virtual PasswordStore* GetPasswordStore() override;
   virtual PasswordManagerDriver* GetDriver() override;