Revert of Limit form-less Autofilling to pages that look like checkout pages.

components/autofill/content/renderer/form_autofill_util.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/form_autofill_util.h"
 
 #include <map>
 #include <set>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/common/autofill_data_validation.h"
-#include "components/autofill/core/common/autofill_regexes.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebElementCollection.h"
 #include "third_party/WebKit/public/web/WebFormControlElement.h"
 #include "third_party/WebKit/public/web/WebFormElement.h"
@@ skipping 1127 matching lines @@
                                       FormFieldData* field) {
   DCHECK(field);
   DCHECK(!element.isNull());
   CR_DEFINE_STATIC_LOCAL(WebString, kAutocomplete, ("autocomplete"));
   CR_DEFINE_STATIC_LOCAL(WebString, kRole, ("role"));
 
   // The label is not officially part of a WebFormControlElement; however, the
   // labels for all form control elements are scraped from the DOM and set in
   // WebFormElementToFormData.
   field->name = element.nameForAutofill();
-  field->form_control_type = element.formControlType().utf8();
-  field->autocomplete_attribute = element.getAttribute(kAutocomplete).utf8();
+  field->form_control_type = base::UTF16ToUTF8(element.formControlType());
+  field->autocomplete_attribute =
+      base::UTF16ToUTF8(element.getAttribute(kAutocomplete));
   if (field->autocomplete_attribute.size() > kMaxDataLength) {
     // Discard overly long attribute values to avoid DOS-ing the browser
     // process.  However, send over a default string to indicate that the
     // attribute was present.
     field->autocomplete_attribute = "x-max-data-length-exceeded";
   }
   if (LowerCaseEqualsASCII(element.getAttribute(kRole), "presentation"))
     field->role = FormFieldData::ROLE_ATTRIBUTE_PRESENTATION;
 
   if (!IsAutofillableElement(element))
@@ skipping 102 matching lines @@
       fieldsets->push_back(element);
     }
   }
   return ExtractAutofillableElementsFromSet(unowned_fieldset_children);
 }
 
 bool UnownedFormElementsAndFieldSetsToFormData(
     const std::vector<blink::WebElement>& fieldsets,
     const std::vector<blink::WebFormControlElement>& control_elements,
     const blink::WebFormControlElement* element,
-    const blink::WebDocument& document,
+    const GURL& origin,
     ExtractMask extract_mask,
     FormData* form,
     FormFieldData* field) {
-  // Only attempt formless Autofill on checkout flows. This avoids the many
-  // false positives found on the non-checkout web. See http://crbug.com/462375
-  // For now this early abort only applies to English-language pages, because
-  // the regex is not translated. Note that an empty "lang" attribute counts as
-  // English. A potential problem is that this only checks document.title(), but
-  // should actually check the main frame's title. Thus it may make bad
-  // decisions for iframes.
-  WebElement html_element = document.documentElement();
-  std::string lang;
-  if (!html_element.isNull())
-    lang = html_element.getAttribute("lang").utf8();
-  if ((lang.empty() || StartsWithASCII(lang, "en", false)) &&
-      !MatchesPattern(document.title(),
-          base::UTF8ToUTF16("payment|checkout|address|delivery|shipping"))) {
-    return false;
-  }
-
-  form->origin = document.url();
+  form->origin = origin;
   form->user_submitted = false;
   form->is_form_tag = false;
 
   return FormOrFieldsetsToFormData(nullptr, element, fieldsets,
                                    control_elements, extract_mask, form, field);
 }
 
 bool FindFormAndFieldForFormControlElement(const WebFormControlElement& element,
                                            FormData* form,
                                            FormFieldData* field) {
   if (!IsAutofillableElement(element))
     return false;
 
   ExtractMask extract_mask =
       static_cast<ExtractMask>(EXTRACT_VALUE | EXTRACT_OPTIONS);
   const WebFormElement form_element = element.form();
   if (form_element.isNull()) {
     // No associated form, try the synthetic form for unowned form elements.
     WebDocument document = element.document();
     std::vector<WebElement> fieldsets;
     std::vector<WebFormControlElement> control_elements =
         GetUnownedAutofillableFormFieldElements(document.all(), &fieldsets);
     return UnownedFormElementsAndFieldSetsToFormData(
-        fieldsets, control_elements, &element, document, extract_mask,
+        fieldsets, control_elements, &element, document.url(), extract_mask,
         form, field);
   }
 
   return WebFormElementToFormData(form_element,
                                   element,
                                   extract_mask,
                                   form,
                                   field);
 }
 
@@ skipping 170 matching lines @@
 
 gfx::RectF GetScaledBoundingBox(float scale, WebElement* element) {
   gfx::Rect bounding_box(element->boundsInViewportSpace());
   return gfx::RectF(bounding_box.x() * scale,
                     bounding_box.y() * scale,
                     bounding_box.width() * scale,
                     bounding_box.height() * scale);
 }
 
 }  // namespace autofill