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..162adb53b3e91c3391fc2da4b2b856dc394b2734 100644
--- a/components/autofill/core/common/form_field_data.cc
+++ b/components/autofill/core/common/form_field_data.cc
@@ -50,8 +50,8 @@ bool ReadAsInt(base::PickleIterator* iter, T* target_value) {
   return true;
 }
 
-bool DeserializeCommonSection1(base::PickleIterator* iter,
-                               FormFieldData* field_data) {
+bool DeserializeSection1(base::PickleIterator* iter,
+                         FormFieldData* field_data) {
   return iter->ReadString16(&field_data->label) &&
          iter->ReadString16(&field_data->name) &&
          iter->ReadString16(&field_data->value) &&
@@ -65,18 +65,18 @@ bool DeserializeCommonSection1(base::PickleIterator* iter,
          iter->ReadBool(&field_data->should_autocomplete);
 }
 
-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);
-}
-
 bool DeserializeVersion2Specific(base::PickleIterator* iter,

[vabr (Chromium), 2016/06/07 07:14:22]

nit: This should also have the name of the form DeserializeSection<number>.

                                  FormFieldData* field_data) {
   return ReadAsInt(iter, &field_data->role);
 }
 
+bool DeserializeSection2(base::PickleIterator* iter,

[vabr (Chromium), 2016/06/07 07:14:22]

Please do not move this, just rename. That way git blame will only point to your
CL at the first line, making digging through history easier.

+                         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,

[vabr (Chromium), 2016/06/07 07:14:22]

nit: This should also have the name of the form DeserializeSection<number>.

                                  FormFieldData* field_data) {
   return iter->ReadString16(&field_data->placeholder);
@@ -188,26 +188,26 @@ bool DeserializeFormFieldData(base::PickleIterator* iter,
 
   switch (version) {
     case 1: {
-      if (!DeserializeCommonSection1(iter, &temp_form_field_data) ||
-          !DeserializeCommonSection2(iter, &temp_form_field_data)) {
+      if (!DeserializeSection1(iter, &temp_form_field_data) ||
+          !DeserializeSection2(iter, &temp_form_field_data)) {
         LOG(ERROR) << "Could not deserialize FormFieldData from pickle";
         return false;
       }
       break;
     }
     case 2: {
-      if (!DeserializeCommonSection1(iter, &temp_form_field_data) ||
+      if (!DeserializeSection1(iter, &temp_form_field_data) ||
           !DeserializeVersion2Specific(iter, &temp_form_field_data) ||
-          !DeserializeCommonSection2(iter, &temp_form_field_data)) {
+          !DeserializeSection2(iter, &temp_form_field_data)) {
         LOG(ERROR) << "Could not deserialize FormFieldData from pickle";
         return false;
       }
       break;
     }
     case 3: {
-      if (!DeserializeCommonSection1(iter, &temp_form_field_data) ||
+      if (!DeserializeSection1(iter, &temp_form_field_data) ||
           !DeserializeVersion2Specific(iter, &temp_form_field_data) ||
-          !DeserializeCommonSection2(iter, &temp_form_field_data) ||
+          !DeserializeSection2(iter, &temp_form_field_data) ||
           !DeserializeVersion3Specific(iter, &temp_form_field_data)) {
         LOG(ERROR) << "Could not deserialize FormFieldData from pickle";
         return false;