Merge autofill::FormFieldData::is_checkable and is_checked

chrome/renderer/autofill/form_autofill_browsertest.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 <stddef.h>
 
 #include <vector>
 
 #include "base/format_macros.h"
 #include "base/macros.h"
@@ skipping 1693 matching lines @@
   WebInputElement element = GetInputElementById("checkbox");
   element.setAutofilled(true);
   FormFieldData result;
   WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
 
   FormFieldData expected;
   expected.name = ASCIIToUTF16("checkbox");
   expected.value = ASCIIToUTF16("mail");
   expected.form_control_type = "checkbox";
   expected.is_autofilled = true;
-  expected.is_checkable = true;
-  expected.is_checked = true;
+  expected.check_status = FormFieldData::CHECKED;
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, result);
 
   element = GetInputElementById("radio");
   element.setAutofilled(true);
   WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
   expected.name = ASCIIToUTF16("radio");
   expected.value = ASCIIToUTF16("male");
   expected.form_control_type = "radio";
   expected.is_autofilled = true;
-  expected.is_checkable = true;
-  expected.is_checked = false;
+  expected.check_status = FormFieldData::CHECKABLE_BUT_UNCHECKED;
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, result);
 }
 
 // We should be able to extract a <select> field.
 TEST_F(FormAutofillTest, WebFormControlElementToFormFieldSelect) {
   LoadHTML("<SELECT id='element'/>"
            "  <OPTION value='CA'>California</OPTION>"
            "  <OPTION value='TX'>Texas</OPTION>"
            "</SELECT>");
 
@@ skipping 2845 matching lines @@
 
     if (test_case.has_extracted_form) {
       EXPECT_EQ(test_case.is_form_tag, forms[0].is_form_tag);
       EXPECT_EQ(test_case.is_formless_checkout, forms[0].is_formless_checkout);
     }
   }
 }
 
 }  // namespace form_util
 }  // namespace autofill