[Password Manager] Unify action and origin detection

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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 170 matching lines @@
          (!FillDataContainsUsername(data) ||
           FindFormInputElement(form_element, data.username_field, result));
 }
 
 // Helper to locate form elements identified by |data|.
 void FindFormElements(content::RenderFrame* render_frame,
                       const PasswordFormFillData& data,
                       FormElementsList* results) {
   DCHECK(results);
 
-  GURL::Replacements rep;
-  rep.ClearQuery();
-  rep.ClearRef();
-
   blink::WebDocument doc = render_frame->GetWebFrame()->document();
   if (!doc.isHTMLDocument())
     return;
 
-  GURL full_origin(doc.url());
-  if (data.origin != full_origin.ReplaceComponents(rep))
+  if (data.origin != 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];
 
-    GURL full_action(doc.completeURL(fe.action()));
-    if (full_action.is_empty()) {
-      // The default action URL is the form's origin.
-      full_action = full_origin;
-    }
-
     // Action URL must match.
-    if (data.action != full_action.ReplaceComponents(rep))
+    if (data.action != GetCanonicalActionForForm(fe))
       continue;
 
     scoped_ptr<FormElements> curr_elements(new FormElements);
     if (!FindFormInputElements(&fe, data, curr_elements.get()))
       continue;
 
     // We found the right element.
     // Note: this assignment adds a reference to |fe|.
     curr_elements->form_element = fe;
     results->push_back(curr_elements.release());
@@ skipping 1206 matching lines @@
 void PasswordAutofillAgent::LegacyPasswordAutofillAgent::DidStopLoading() {
   agent_->DidStopLoading();
 }
 
 void PasswordAutofillAgent::LegacyPasswordAutofillAgent::
     DidStartProvisionalLoad(blink::WebLocalFrame* navigated_frame) {
   agent_->LegacyDidStartProvisionalLoad(navigated_frame);
 }
 
 }  // namespace autofill