Index: components/password_manager/core/browser/password_form_manager.cc |
diff --git a/components/password_manager/core/browser/password_form_manager.cc b/components/password_manager/core/browser/password_form_manager.cc |
index b642296ddba651cc8b1c420f5699f3d818ff9310..6d2b91ba9bd9b9c732e79756ee0dda05c93cc0c4 100644 |
--- a/components/password_manager/core/browser/password_form_manager.cc |
+++ b/components/password_manager/core/browser/password_form_manager.cc |
@@ -140,10 +140,14 @@ PasswordFormManager::MatchResultMask PasswordFormManager::DoesManage( |
StartsWithASCII(new_path, old_path, /*case_sensitive=*/true); |
} |
+ if (!origins_match) |
+ return result; |
+ |
+ result |= RESULT_ORIGINS_MATCH; |
+ |
if (form.username_element == observed_form_.username_element && |
- form.password_element == observed_form_.password_element && |
- origins_match) { |
- result |= RESULT_MANDATORY_ATTRIBUTES_MATCH; |
+ form.password_element == observed_form_.password_element) { |
+ result |= RESULT_HTML_ATTRIBUTES_MATCH; |
} |
// Note: although saved password forms might actually have an empty action |
@@ -402,13 +406,6 @@ bool PasswordFormManager::HasCompletedMatching() const { |
return state_ == POST_MATCHING_PHASE; |
} |
-bool PasswordFormManager::IsIgnorableChangePasswordForm() const { |
- bool is_change_password_form = !observed_form_.new_password_element.empty() && |
- !observed_form_.password_element.empty(); |
- bool is_username_certainly_correct = observed_form_.username_marked_by_site; |
- return is_change_password_form && !is_username_certainly_correct; |
-} |
- |
void PasswordFormManager::OnRequestDone( |
ScopedVector<PasswordForm> logins_result) { |
const size_t logins_result_size = logins_result.size(); |