[Password Manager] Make filling robust against changing url by JavaScript

components/autofill/content/renderer/password_autofill_agent.cc

Index: components/autofill/content/renderer/password_autofill_agent.cc
diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc
index dfa8d4eac5c4a9318f5d32539ac181b99030a9a1..817a6e8e1b38dd4a4f9f81df23a7e106be2bc763 100644
--- a/components/autofill/content/renderer/password_autofill_agent.cc
+++ b/components/autofill/content/renderer/password_autofill_agent.cc
@@ -255,7 +255,8 @@ void FindFormElements(content::RenderFrame* render_frame,
 
   blink::WebDocument doc = render_frame->GetWebFrame()->GetDocument();
 
-  if (data.origin != form_util::GetCanonicalOriginForDocument(doc))
+  if (GetSignOnRealm(data.origin) !=
+      GetSignOnRealm(form_util::GetCanonicalOriginForDocument(doc)))
     return;
 
   blink::WebVector<blink::WebFormElement> forms;
@@ -1227,10 +1228,8 @@ void PasswordAutofillAgent::SendPasswordForms(bool only_visible) {
       password_forms.back().scheme = PasswordForm::SCHEME_HTML;
       password_forms.back().origin =
           form_util::GetCanonicalOriginForDocument(frame->GetDocument());
-      GURL::Replacements rep;
-      rep.SetPathStr("");
       password_forms.back().signon_realm =
-          password_forms.back().origin.ReplaceComponents(rep).spec();
+          GetSignOnRealm(password_forms.back().origin);
     }
     if (!password_forms.empty()) {
       sent_request_to_store_ = true;