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

components/autofill/content/renderer/password_form_conversion_utils.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/content/renderer/password_form_conversion_utils.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 571 matching lines @@
         // |typed_username_value|. In case when it was, |typed_username_value|
         // is incomplete, so we should leave autofilled value.
         username_value = typed_username_value;
       }
     }
     password_form->username_value = username_value;
   }
 
   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()) {
     password_form->password_element = FieldName(password, "anonymous_password");
     blink::WebString password_value = password.Value();
     if (FieldHasNonscriptModifiedValue(field_value_and_properties_map,
                                        password))
       password_value = blink::WebString::FromUTF16(
           *field_value_and_properties_map->at(password).first);
     password_form->password_value = password_value.Utf16();
@@ skipping 153 matching lines @@
            autocomplete_value_lowercase, base::kWhitespaceASCII,
            base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
     if (base::StartsWith(token, kAutocompleteCreditCardPrefix,
                          base::CompareCase::SENSITIVE)) {
       return true;
     }
   }
   return false;
 }
 
+std::string GetSignOnRealm(const GURL& origin) {
+  GURL::Replacements rep;
+  rep.SetPathStr("");
+  return origin.ReplaceComponents(rep).spec();
+}
 }  // namespace autofill