Autofill:Autocomplete: Enable autocheckout of input elements of type password. This will support fi…

components/autofill/browser/form_structure.cc

 // Copyright (c) 2012 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/browser/form_structure.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 215 matching lines @@
 }
 
 }  // namespace
 
 FormStructure::FormStructure(const FormData& form,
                              const std::string& autocheckout_url_prefix)
     : form_name_(form.name),
       source_url_(form.origin),
       target_url_(form.action),
       autofill_count_(0),
-      checkable_field_count_(0),
+      active_field_count_(0),
       upload_required_(USE_UPLOAD_RATES),
       server_experiment_id_("no server response"),
       has_author_specified_types_(false),
       autocheckout_url_prefix_(autocheckout_url_prefix) {
   // Copy the form fields.
   std::map<string16, size_t> unique_names;
   for (std::vector<FormFieldData>::const_iterator field =
            form.fields.begin();
        field != form.fields.end(); field++) {
 
-    // Skipping checkable elements when Autocheckout is not enabled, else
-    // these fields will interfere with existing field signatures with Autofill
-    // servers.
-    if (!field->is_checkable || IsAutocheckoutEnabled()) {
+    // Skip checkable and password elements when Autocheckout is not enabled,
+    // else these fields will interfere with existing field signatures with
+    // Autofill servers.
+    if ((!field->is_checkable && field->form_control_type != "password") ||
+        IsAutocheckoutEnabled()) {
       // Add all supported form fields (including with empty names) to the
       // signature.  This is a requirement for Autofill servers.
       form_signature_field_names_.append("&");
       form_signature_field_names_.append(UTF16ToUTF8(field->name));
+
+      ++active_field_count_;
     }
 
     // Generate a unique name for this field by appending a counter to the name.
     // Make sure to prepend the counter with a non-numeric digit so that we are
     // guaranteed to avoid collisions.
     if (!unique_names.count(field->name))
       unique_names[field->name] = 1;
     else
       ++unique_names[field->name];
     string16 unique_name = field->name + ASCIIToUTF16("_") +
         base::IntToString16(unique_names[field->name]);
     fields_.push_back(new AutofillField(*field, unique_name));
-
-    if (field->is_checkable)
-      ++checkable_field_count_;
   }
 
   std::string method = UTF16ToUTF8(form.method);
   if (StringToLowerASCII(method) == kFormMethodPost) {
     method_ = POST;
   } else {
     // Either the method is 'get', or we don't know.  In this case we default
     // to GET.
     method_ = GET;
   }
@@ skipping 322 matching lines @@
   autofill_count_ = 0;
   for (std::vector<AutofillField*>::const_iterator iter = begin();
        iter != end(); ++iter) {
     AutofillField* field = *iter;
     if (field && field->IsFieldFillable())
       ++autofill_count_;
   }
 }
 
 bool FormStructure::ShouldBeParsed(bool require_method_post) const {
-  // Ignore counting checkable elements towards minimum number of elements
-  // required to parse. This avoids trying to crowdsource forms with few text
-  // or select elements.
-  if ((field_count() - checkable_field_count()) < RequiredFillableFields())
+  if (active_field_count() < RequiredFillableFields())
     return false;
 
   // Rule out http(s)://*/search?...
   //  e.g. http://www.google.com/search?q=...
   //       http://search.yahoo.com/search?p=...
   if (target_url_.path() == "/search")
     return false;
 
   if (!IsAutocheckoutEnabled()) {
     // Make sure there is at least one text field when Autocheckout is
@@ skipping 244 matching lines @@
 
 AutofillField* FormStructure::field(size_t index) {
   return const_cast<AutofillField*>(
       static_cast<const FormStructure*>(this)->field(index));
 }
 
 size_t FormStructure::field_count() const {
   return fields_.size();
 }
 
-size_t FormStructure::checkable_field_count() const {
-  return checkable_field_count_;
+size_t FormStructure::active_field_count() const {
+  return active_field_count_;
 }
 
 std::string FormStructure::server_experiment_id() const {
   return server_experiment_id_;
 }
 
 FormData FormStructure::ToFormData() const {
   // |data.user_submitted| will always be false.
   FormData data;
   data.name = form_name_;
@@ skipping 71 matching lines @@
         buzz::XmlElement *field_element = new buzz::XmlElement(
             buzz::QName(kXMLElementField));
 
         field_element->SetAttr(buzz::QName(kAttributeSignature),
                                field->FieldSignature());
         field_element->SetAttr(buzz::QName(kAttributeAutofillType),
                                base::IntToString(*field_type));
         encompassing_xml_element->AddElement(field_element);
       }
     } else {
-      // Skip putting checkable fields in the request if Autocheckout is not
-      // enabled.
-      if (field->is_checkable && !IsAutocheckoutEnabled())
+      // Skip putting checkable and password fields in the request if
+      // Autocheckout is not enabled.
+      if ((field->is_checkable || field->form_control_type == "password") &&
+          !IsAutocheckoutEnabled())
         continue;
 
       buzz::XmlElement *field_element = new buzz::XmlElement(
           buzz::QName(kXMLElementField));
       field_element->SetAttr(buzz::QName(kAttributeSignature),
                              field->FieldSignature());
       encompassing_xml_element->AddElement(field_element);
     }
   }
   return true;
@@ skipping 162 matching lines @@
   for (std::vector<AutofillField*>::iterator field = fields_.begin();
        field != fields_.end(); ++field) {
     AutofillType::FieldTypeGroup field_type_group =
         AutofillType((*field)->type()).group();
     if (field_type_group == AutofillType::CREDIT_CARD)
       (*field)->set_section((*field)->section() + "-cc");
     else
       (*field)->set_section((*field)->section() + "-default");
   }
 }