Merge autofill::FormFieldData::is_checkable and is_checked

components/autofill/content/renderer/form_autofill_util.cc

Index: components/autofill/content/renderer/form_autofill_util.cc
diff --git a/components/autofill/content/renderer/form_autofill_util.cc b/components/autofill/content/renderer/form_autofill_util.cc
index cf0e30fe11cb45ab94de0a502049eb69290d9544..2fce3a56bf206d40a6c06b24457d79c1961072a1 100644
--- a/components/autofill/content/renderer/form_autofill_util.cc
+++ b/components/autofill/content/renderer/form_autofill_util.cc
@@ -889,7 +889,7 @@ void FillFormField(const FormFieldData& data,
 
   WebInputElement* input_element = toWebInputElement(field);
   if (IsCheckableElement(input_element)) {
-    input_element->setChecked(data.is_checked, true);
+    input_element->setChecked(IsCheckable(data.check_status), true);

[vabr (Chromium), 2016/06/06 12:39:30]

Did you mean IsChecked instead of IsCheckable?

   } else {
     base::string16 value = data.value;
     if (IsTextInput(input_element) || IsMonthInput(input_element)) {
@@ -1404,8 +1404,8 @@ void WebFormControlElementToFormField(const WebFormControlElement& element,
     if (IsTextInput(input_element))
       field->max_length = input_element->maxLength();
 
-    field->is_checkable = IsCheckableElement(input_element);
-    field->is_checked = input_element->isChecked();
+    SetCheckStatus(field, IsCheckableElement(input_element),
+                    input_element->isChecked());
   } else if (IsTextAreaElement(element)) {
     // Nothing more to do in this case.
   } else if (extract_mask & EXTRACT_OPTIONS) {