Refactor the naming scheme of Deserialize* functions in form_field_data.cc

components/autofill/core/common/form_field_data.cc

Index: components/autofill/core/common/form_field_data.cc
diff --git a/components/autofill/core/common/form_field_data.cc b/components/autofill/core/common/form_field_data.cc
index dee52c7908cec94f72058b4a34edbf92bb8a70e4..478036b1c9815c990dd9792e304011f08e87dd2f 100644
--- a/components/autofill/core/common/form_field_data.cc
+++ b/components/autofill/core/common/form_field_data.cc
@@ -58,18 +58,19 @@ bool DeserializeCommonSection1(base::PickleIterator* iter,
          iter->ReadString(&field_data->form_control_type) &&
          iter->ReadString(&field_data->autocomplete_attribute) &&
          iter->ReadUInt64(&field_data->max_length) &&
-         iter->ReadBool(&field_data->is_autofilled) &&
-         iter->ReadBool(&field_data->is_checked) &&
-         iter->ReadBool(&field_data->is_checkable) &&
-         iter->ReadBool(&field_data->is_focusable) &&
-         iter->ReadBool(&field_data->should_autocomplete);
+         iter->ReadBool(&field_data->is_autofilled);
+}
+
+bool DeserializeCheckStaus(base::PickleIterator* iter,

[vabr (Chromium), 2016/06/06 15:40:01]

Actually, let's not split DeserializeCommonSection1 here at all, keep this CL
just for the renaming. The split belongs to your main CL
(https://codereview.chromium.org/2022123002/).

When you do it there, you will notice that the second and third part split from
what you'll rename to DeserializeSection1 will need to take numbers 5 and 6,
because 2 and 3 will be already taken. But that's no problem. The main point
will be that you won't have to edit the deserialization code for older versions
at all, and the simple names like "DeserializeSection2" will not need to be
changed (as they are not tied to what is actually done and for which version and
where).

[vabr (Chromium), 2016/06/06 15:40:01]

typo: Staus -> Status

Having said that, this name would become confusing in your new patch (as this
part will actually be replaced by check_status). Please just do the
DeserializeSection<number> as advised above.

+                           FormFieldData* field_data) {
+  return iter->ReadBool(&field_data->is_checked) &&
+         iter->ReadBool(&field_data->is_checkable);
 }
 
 bool DeserializeCommonSection2(base::PickleIterator* iter,
                                FormFieldData* field_data) {
-  return ReadAsInt(iter, &field_data->text_direction) &&
-         ReadStringVector(iter, &field_data->option_values) &&
-         ReadStringVector(iter, &field_data->option_contents);
+  return iter->ReadBool(&field_data->is_focusable) &&
+         iter->ReadBool(&field_data->should_autocomplete);
 }
 
 bool DeserializeVersion2Specific(base::PickleIterator* iter,
@@ -77,6 +78,13 @@ bool DeserializeVersion2Specific(base::PickleIterator* iter,
   return ReadAsInt(iter, &field_data->role);
 }
 
+bool DeserializeCommonSection3(base::PickleIterator* iter,
+                               FormFieldData* field_data) {
+  return ReadAsInt(iter, &field_data->text_direction) &&
+         ReadStringVector(iter, &field_data->option_values) &&
+         ReadStringVector(iter, &field_data->option_contents);
+}
+
 bool DeserializeVersion3Specific(base::PickleIterator* iter,
                                  FormFieldData* field_data) {
   return iter->ReadString16(&field_data->placeholder);
@@ -189,7 +197,9 @@ bool DeserializeFormFieldData(base::PickleIterator* iter,
   switch (version) {
     case 1: {
       if (!DeserializeCommonSection1(iter, &temp_form_field_data) ||
-          !DeserializeCommonSection2(iter, &temp_form_field_data)) {
+          !DeserializeCheckStaus(iter, &temp_form_field_data) ||
+          !DeserializeCommonSection2(iter, &temp_form_field_data) ||
+          !DeserializeCommonSection3(iter, &temp_form_field_data)) {
         LOG(ERROR) << "Could not deserialize FormFieldData from pickle";
         return false;
       }
@@ -197,8 +207,10 @@ bool DeserializeFormFieldData(base::PickleIterator* iter,
     }
     case 2: {
       if (!DeserializeCommonSection1(iter, &temp_form_field_data) ||
+          !DeserializeCheckStaus(iter, &temp_form_field_data) ||
+          !DeserializeCommonSection2(iter, &temp_form_field_data) ||
           !DeserializeVersion2Specific(iter, &temp_form_field_data) ||
-          !DeserializeCommonSection2(iter, &temp_form_field_data)) {
+          !DeserializeCommonSection3(iter, &temp_form_field_data)) {
         LOG(ERROR) << "Could not deserialize FormFieldData from pickle";
         return false;
       }
@@ -206,8 +218,10 @@ bool DeserializeFormFieldData(base::PickleIterator* iter,
     }
     case 3: {
       if (!DeserializeCommonSection1(iter, &temp_form_field_data) ||
-          !DeserializeVersion2Specific(iter, &temp_form_field_data) ||
+          !DeserializeCheckStaus(iter, &temp_form_field_data) ||
           !DeserializeCommonSection2(iter, &temp_form_field_data) ||
+          !DeserializeVersion2Specific(iter, &temp_form_field_data) ||
+          !DeserializeCommonSection3(iter, &temp_form_field_data) ||
           !DeserializeVersion3Specific(iter, &temp_form_field_data)) {
         LOG(ERROR) << "Could not deserialize FormFieldData from pickle";
         return false;