Merge autofill::FormFieldData::is_checkable and is_checked

components/autofill/core/browser/form_field.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_field.h"
 
 #include <algorithm>
 #include <cstddef>
 #include <iterator>
 #include <memory>
@@ skipping 16 matching lines @@
 
 namespace autofill {
 namespace {
 
 bool ShouldBeProcessed(const AutofillField* field) {
   // Ignore checkable fields as they interfere with parsers assuming context.
   // Eg., while parsing address, "Is PO box" checkbox after ADDRESS_LINE1
   // interferes with correctly understanding ADDRESS_LINE2.
   // Ignore fields marked as presentational. See
   // http://www.w3.org/TR/wai-aria/roles#presentation
-  return !(field->is_checkable ||
+  return !(IsCheckable(field->check_status) ||
            field->role == FormFieldData::ROLE_ATTRIBUTE_PRESENTATION);
 }
 
 }  // namespace
 
 // There's an implicit precedence determined by the values assigned here. Email
 // is currently the most important followed by Phone, Address, Credit Card and
 // finally Name.
 const float FormField::kBaseEmailParserScore = 1.4f;
 const float FormField::kBasePhoneParserScore = 1.3f;
@@ skipping 157 matching lines @@
   if ((match_type & MATCH_PASSWORD) && type == "password")
     return true;
 
   if ((match_type & MATCH_NUMBER) && type == "number")
     return true;
 
   return false;
 }
 
 }  // namespace autofill