Merge autofill::FormFieldData::is_checkable and is_checked

components/autofill/core/common/form_field_data.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_COMMON_FORM_FIELD_DATA_H_
 #define COMPONENTS_AUTOFILL_CORE_COMMON_FORM_FIELD_DATA_H_
 
 #include <stddef.h>
 
 #include <vector>
@@ skipping 11 matching lines @@
 // Stores information about a field in a form.
 struct FormFieldData {
   // Copied to components/autofill/ios/browser/resources/autofill_controller.js.
   enum RoleAttribute {
     // "presentation"
     ROLE_ATTRIBUTE_PRESENTATION,
     // Anything else.
     ROLE_ATTRIBUTE_OTHER,
   };
 
+  enum CheckStatus {

[vabr (Chromium), 2016/05/31 15:48:25]

Please use enum class instead of enum, to get better protection against unwanted
casts and also to isolate the values in their own namespace.

Once you do that, please drop the CHECK_STATUS_ prefix from the values, it will
be replaced by the namespace.

[Hwanseung Lee(hs1217.lee), 2016/06/09 15:41:59]

if enum class used instead of enum, it is complex to serialize & deserialize.
could you teach me how to use easily serialize & deserialize when use enum
class?

+    CHECK_STATUS_NOT_CHECKABLE,
+    CHECK_STATUS_CHECKABLE_BUT_UNCHECKED,
+    CHECK_STATUS_CHECKED,
+  };
+
   FormFieldData();
   FormFieldData(const FormFieldData& other);
   ~FormFieldData();
 
   // Returns true if two form fields are the same, not counting the value.
   bool SameFieldAs(const FormFieldData& field) const;
 
   // Comparison operator exposed for STL map. Uses label, then name to sort.
   bool operator<(const FormFieldData& field) const;
 
   // If you add more, be sure to update the comparison operator, SameFieldAs,
   // serializing functions (in the .cc file) and the constructor.
   base::string16 label;
   base::string16 name;
   base::string16 value;
   std::string form_control_type;
   std::string autocomplete_attribute;
   base::string16 placeholder;
   // Note: we use uint64_t instead of size_t because this struct is sent over
   // IPC which could span 32 & 64 bit processes. We chose uint64_t instead of
   // uint32_t to maintain compatibility with old code which used size_t
   // (base::Pickle used to serialize that as 64 bit).
   uint64_t max_length;
   bool is_autofilled;
-  bool is_checked;
-  bool is_checkable;
+  CheckStatus check_status;
   bool is_focusable;
   bool should_autocomplete;
   RoleAttribute role;
   base::i18n::TextDirection text_direction;
 
   // For the HTML snippet |<option value="US">United States</option>|, the
   // value is "US" and the contents are "United States".
   std::vector<base::string16> option_values;
   std::vector<base::string16> option_contents;
 };
@@ skipping 20 matching lines @@
     EXPECT_EQ(expected.placeholder, actual.placeholder);                       \
     EXPECT_EQ(expected.max_length, actual.max_length);                         \
     EXPECT_EQ(expected.is_autofilled, actual.is_autofilled);                   \
     EXPECT_EQ(expected.is_checked, actual.is_checked);                         \
     EXPECT_EQ(expected.is_checkable, actual.is_checkable);                     \
   } while (0)
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_COMMON_FORM_FIELD_DATA_H_