Index: components/password_manager/core/browser/password_manager.cc |
diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc |
index d3d2d587a23587951aec18c9f98dc372348e66c2..07ed300bf6b975ac929425eb739fe91778f0004c 100644 |
--- a/components/password_manager/core/browser/password_manager.cc |
+++ b/components/password_manager/core/browser/password_manager.cc |
@@ -41,7 +41,6 @@ |
#endif |
using autofill::PasswordForm; |
-using autofill::PasswordFormMap; |
namespace password_manager { |
@@ -739,8 +738,8 @@ bool PasswordManager::OtherPossibleUsernamesEnabled() const { |
void PasswordManager::Autofill( |
password_manager::PasswordManagerDriver* driver, |
const PasswordForm& form_for_autofill, |
- const PasswordFormMap& best_matches, |
- const std::vector<std::unique_ptr<PasswordForm>>& federated_matches, |
+ const std::map<base::string16, const PasswordForm*>& best_matches, |
+ const std::vector<const PasswordForm*>& federated_matches, |
const PasswordForm& preferred_match, |
bool wait_for_username) const { |
DCHECK_EQ(PasswordForm::SCHEME_HTML, preferred_match.scheme); |
@@ -772,8 +771,7 @@ void PasswordManager::Autofill( |
void PasswordManager::ShowInitialPasswordAccountSuggestions( |
password_manager::PasswordManagerDriver* driver, |
const PasswordForm& form_for_autofill, |
- const PasswordFormMap& best_matches, |
- const std::vector<std::unique_ptr<PasswordForm>>& federated_matches, |
+ const std::map<base::string16, const PasswordForm*>& best_matches, |
const PasswordForm& preferred_match, |
bool wait_for_username) const { |
DCHECK_EQ(PasswordForm::SCHEME_HTML, preferred_match.scheme); |
@@ -796,7 +794,7 @@ void PasswordManager::ShowInitialPasswordAccountSuggestions( |
} |
void PasswordManager::AutofillHttpAuth( |
- const PasswordFormMap& best_matches, |
+ const std::map<base::string16, const PasswordForm*>& best_matches, |
const PasswordForm& preferred_match) const { |
DCHECK_NE(PasswordForm::SCHEME_HTML, preferred_match.scheme); |