[Password Manager, merge to M-59] 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 212eef1913636fe4d376f0826c5d5bf3a8df9195..26748925a778b0ddaa960e96b52de42f0947ce22 100644
--- a/components/autofill/content/renderer/password_autofill_agent.cc
+++ b/components/autofill/content/renderer/password_autofill_agent.cc
@@ -253,7 +253,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;
@@ -1155,10 +1156,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);
       sent_request_to_store_ = true;
     }
     if (!password_forms.empty())