Merge autofill::FormFieldData::is_checkable and is_checked

components/autofill/core/browser/form_field_unittest.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 "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/form_field.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 113 matching lines @@
 
 // Test that we ignore checkable elements.
 TEST(FormFieldTest, ParseFormFields) {
   ScopedVector<AutofillField> fields;
   FormFieldData field_data;
   field_data.form_control_type = "text";
 
   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));
 
   // Does not parse since there are only 2 recognized fields.
   ASSERT_TRUE(FormField::ParseFormFields(fields.get(), true).empty());
 
   field_data.label = ASCIIToUTF16("City");
   fields.push_back(new AutofillField(field_data, field_data.label));
 
@@ skipping 35 matching lines @@
   EXPECT_TRUE(field_candidates_map.find(unique_name) !=
               field_candidates_map.end());
 
   // Because we use a handcrafted field name, we can expect it to match more
   // than just one parser (at least email, but probably some more from the other
   // parsers).
   EXPECT_LT(1U, field_candidates_map.at(unique_name).field_candidates().size());
 }
 
 }  // namespace autofill