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

components/autofill/core/common/form_field_data.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 "components/autofill/core/common/form_field_data.h"
 
 #include "base/pickle.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 
@@ skipping 32 matching lines @@
 template <typename T>
 bool ReadAsInt(base::PickleIterator* iter, T* target_value) {
   int pickle_data;
   if (!iter->ReadInt(&pickle_data))
     return false;
 
   *target_value = static_cast<T>(pickle_data);
   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) &&
          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);
 }
 
-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);
 }
 
 }  // namespace
 
 FormFieldData::FormFieldData()
     : max_length(0),
       is_autofilled(false),
       is_checked(false),
@@ skipping 90 matching lines @@
                               FormFieldData* field_data) {
   int version;
   FormFieldData temp_form_field_data;
   if (!iter->ReadInt(&version)) {
     LOG(ERROR) << "Bad pickle of FormFieldData, no version present";
     return false;
   }
 
   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;
       }
       break;
     }
     default: {
       LOG(ERROR) << "Unknown FormFieldData pickle version " << version;
       return false;
     }
@@ skipping 10 matching lines @@
             << " " << field.max_length << " "
             << (field.is_autofilled ? "true" : "false") << " "
             << (field.is_checked ? "true" : "false") << " "
             << (field.is_checkable ? "true" : "false") << " "
             << (field.is_focusable ? "true" : "false") << " "
             << (field.should_autocomplete ? "true" : "false") << " "
             << field.role << " " << field.text_direction;
 }
 
 }  // namespace autofill