[Password Manager, merge to M-59] Make filling robust against changing url by JavaScript.

components/autofill/content/renderer/password_form_conversion_utils.cc

Index: components/autofill/content/renderer/password_form_conversion_utils.cc
diff --git a/components/autofill/content/renderer/password_form_conversion_utils.cc b/components/autofill/content/renderer/password_form_conversion_utils.cc
index 1a0f3d7ed8f9ecb88bbbe0dff1ecc03cfe364dc1..aed99de70572a1983075a952062fd0bd8594e4a8 100644
--- a/components/autofill/content/renderer/password_form_conversion_utils.cc
+++ b/components/autofill/content/renderer/password_form_conversion_utils.cc
@@ -589,10 +589,7 @@ bool GetPasswordForm(
 
   password_form->origin =
       form_util::GetCanonicalOriginForDocument(form.document);
-  GURL::Replacements rep;
-  rep.SetPathStr("");
-  password_form->signon_realm =
-      password_form->origin.ReplaceComponents(rep).spec();
+  password_form->signon_realm = GetSignOnRealm(password_form->origin);
   password_form->other_possible_usernames.swap(other_possible_usernames);
 
   if (!password.IsNull()) {
@@ -766,4 +763,9 @@ bool HasCreditCardAutocompleteAttributes(
   return false;
 }
 
+std::string GetSignOnRealm(const GURL& origin) {
+  GURL::Replacements rep;
+  rep.SetPathStr("");
+  return origin.ReplaceComponents(rep).spec();
+}
 }  // namespace autofill