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

components/autofill/content/renderer/password_autofill_agent.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_autofill_agent.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
@@ skipping 235 matching lines @@
 
 // Helper to locate form elements identified by |data|.
 void FindFormElements(content::RenderFrame* render_frame,
                       const PasswordFormFillData& data,
                       bool ambiguous_or_empty_names,
                       FormElementsList* results) {
   DCHECK(results);
 
   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;
   doc.Forms(forms);
 
   for (size_t i = 0; i < forms.size(); ++i) {
     blink::WebFormElement fe = forms[i];
 
     // Action URL must match.
     if (data.action != form_util::GetCanonicalActionForForm(fe))
@@ skipping 881 matching lines @@
     // If there is a password field, but the list of password forms is empty for
     // some reason, add a dummy form to the list. It will cause a request to the
     // store. Therefore, saved passwords will be available for filling on click.
     if (!sent_request_to_store_ && password_forms.empty() &&
         HasPasswordField(*frame)) {
       // Set everything that |FormDigest| needs.
       password_forms.push_back(PasswordForm());
       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())
       GetPasswordManagerDriver()->PasswordFormsParsed(password_forms);
   }
 }
 
 void PasswordAutofillAgent::DidFinishDocumentLoad() {
   // The |frame| contents have been parsed, but not yet rendered.  Let the
   // PasswordManager know that forms are loaded, even though we can't yet tell
@@ skipping 465 matching lines @@
 PasswordAutofillAgent::GetPasswordManagerDriver() {
   if (!password_manager_driver_) {
     render_frame()->GetRemoteInterfaces()->GetInterface(
         mojo::MakeRequest(&password_manager_driver_));
   }
 
   return password_manager_driver_;
 }
 
 }  // namespace autofill