Merge autofill::FormFieldData::is_checkable and is_checked

components/autofill/core/browser/form_structure.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/core/browser/form_structure.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 1127 matching lines @@
       }
     }
   }
 }
 
 void FormStructure::EncodeFormForUpload(AutofillUploadContents* upload) const {
   DCHECK(!IsMalformed());
 
   for (const AutofillField* field : fields_) {
     // Don't upload checkable fields.
-    if (field->is_checkable)
+    if (IsCheckable(field->check_status))
       continue;
 
     const ServerFieldTypeSet& types = field->possible_types();
     for (const auto& field_type : types) {
       // Add the same field elements as the query and a few more below.
       if (ShouldSkipField(*field))
         continue;
 
       AutofillUploadContents::Field* added_field = upload->add_field();
       added_field->set_autofill_type(field_type);
@@ skipping 144 matching lines @@
   for (AutofillField* field : fields_) {
     FieldTypeGroup field_type_group = field->Type().group();
     if (field_type_group == CREDIT_CARD)
       field->set_section(field->section() + "-cc");
     else
       field->set_section(field->section() + "-default");
   }
 }
 
 bool FormStructure::ShouldSkipField(const FormFieldData& field) const {
-  return field.is_checkable;
+  return IsCheckable(field.check_status);
 }
 
 void FormStructure::ProcessExtractedFields() {
   // Update the field name parsed by heuristics if several criteria are met.
   // Several fields must be present in the form.
   if (field_count() < kCommonNamePrefixRemovalFieldThreshold)
     return;
 
   // Find the longest common prefix within all the field names.
   std::vector<base::string16> names;
@@ skipping 41 matching lines @@
               filtered_strings[0].at(prefix_len)) {
         // Mismatch found.
         return filtered_strings[i].substr(0, prefix_len);
       }
     }
   }
   return filtered_strings[0];
 }
 
 }  // namespace autofill