Merge autofill::FormFieldData::is_checkable and is_checked

components/autofill/core/browser/form_field_unittest.cc

Index: components/autofill/core/browser/form_field_unittest.cc
diff --git a/components/autofill/core/browser/form_field_unittest.cc b/components/autofill/core/browser/form_field_unittest.cc
index b08730126c9f2982b960bfc87e5825b0f0431567..71e5e12d4766407cf3160a455be95ec7c22c823a 100644
--- a/components/autofill/core/browser/form_field_unittest.cc
+++ b/components/autofill/core/browser/form_field_unittest.cc
@@ -131,12 +131,12 @@ TEST(FormFieldTest, ParseFormFields) {
   field_data.label = ASCIIToUTF16("Address line1");
   fields.push_back(new AutofillField(field_data, field_data.label));
 
-  field_data.is_checkable = true;
+  field_data.check_status = FormFieldData::CHECKABLE_BUT_UNCHECKED;
   field_data.label = ASCIIToUTF16("Is PO Box");
   fields.push_back(new AutofillField(field_data, field_data.label));
 
   // reset |is_checkable| to false.
-  field_data.is_checkable = false;
+  field_data.check_status = FormFieldData::NOT_CHECKABLE;
 
   field_data.label = ASCIIToUTF16("Address line2");
   fields.push_back(new AutofillField(field_data, field_data.label));