| Index: components/password_manager/core/browser/affiliated_match_helper.cc
|
| diff --git a/components/password_manager/core/browser/affiliated_match_helper.cc b/components/password_manager/core/browser/affiliated_match_helper.cc
|
| index ee18665afdc3ee600aecedb9cf5d3b32fd313834..c7076c39804827b87075908d174fa1b024a25735 100644
|
| --- a/components/password_manager/core/browser/affiliated_match_helper.cc
|
| +++ b/components/password_manager/core/browser/affiliated_match_helper.cc
|
| @@ -58,7 +58,7 @@ void AffiliatedMatchHelper::Initialize() {
|
| }
|
|
|
| void AffiliatedMatchHelper::GetAffiliatedAndroidRealms(
|
| - const autofill::PasswordForm& observed_form,
|
| + const PasswordStore::FormDigest& observed_form,
|
| const AffiliatedRealmsCallback& result_callback) {
|
| if (IsValidWebCredential(observed_form)) {
|
| FacetURI facet_uri(
|
| @@ -73,7 +73,7 @@ void AffiliatedMatchHelper::GetAffiliatedAndroidRealms(
|
| }
|
|
|
| void AffiliatedMatchHelper::GetAffiliatedWebRealms(
|
| - const autofill::PasswordForm& android_form,
|
| + const PasswordStore::FormDigest& android_form,
|
| const AffiliatedRealmsCallback& result_callback) {
|
| if (IsValidAndroidCredential(android_form)) {
|
| affiliation_service_->GetAffiliations(
|
| @@ -91,7 +91,7 @@ void AffiliatedMatchHelper::InjectAffiliatedWebRealms(
|
| const PasswordFormsCallback& result_callback) {
|
| std::vector<autofill::PasswordForm*> android_credentials;
|
| for (auto* form : forms) {
|
| - if (IsValidAndroidCredential(*form))
|
| + if (IsValidAndroidCredential(PasswordStore::FormDigest(*form)))
|
| android_credentials.push_back(form);
|
| }
|
| base::Closure on_get_all_realms(
|
| @@ -131,14 +131,14 @@ void AffiliatedMatchHelper::TrimAffiliationCache() {
|
|
|
| // static
|
| bool AffiliatedMatchHelper::IsValidAndroidCredential(
|
| - const autofill::PasswordForm& form) {
|
| + const PasswordStore::FormDigest& form) {
|
| return form.scheme == autofill::PasswordForm::SCHEME_HTML &&
|
| IsValidAndroidFacetURI(form.signon_realm);
|
| }
|
|
|
| // static
|
| bool AffiliatedMatchHelper::IsValidWebCredential(
|
| - const autofill::PasswordForm& form) {
|
| + const PasswordStore::FormDigest& form) {
|
| FacetURI facet_uri(FacetURI::FromPotentiallyInvalidSpec(form.signon_realm));
|
| return form.scheme == autofill::PasswordForm::SCHEME_HTML &&
|
| facet_uri.IsValidWebFacetURI();
|
|
|