autofill: bumped pickle version of FormFieldData

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"
 
 namespace {
 
-const int kPickleVersion = 1;
+// Increment this anytime pickle format is modified as well as provide
+// deserialization routine from previous kPickleVersion format.
+const int kPickleVersion = 2;
 
 void AddVectorToPickle(std::vector<base::string16> strings,
                        Pickle* pickle) {
   pickle->WriteInt(static_cast<int>(strings.size()));
   for (size_t i = 0; i < strings.size(); ++i) {
     pickle->WriteString16(strings[i]);
   }
 }
 
 bool ReadStringVector(PickleIterator* iter,
                       std::vector<base::string16>* strings) {
   int size;
   if (!iter->ReadInt(&size))
     return false;
 
   base::string16 pickle_data;
   for (int i = 0; i < size; i++) {
     if (!iter->ReadString16(&pickle_data))
       return false;
 
     strings->push_back(pickle_data);
   }
   return true;
 }
 
 template <typename T>
-bool ReadAsInt(PickleIterator* iter, T* direction) {
+bool ReadAsInt(PickleIterator* iter, T* target_value) {
   int pickle_data;
   if (!iter->ReadInt(&pickle_data))
     return false;
 
-  *direction = static_cast<T>(pickle_data);
+  *target_value = static_cast<T>(pickle_data);
   return true;
 }
 
 }  // namespace
 
 namespace autofill {
 
 FormFieldData::FormFieldData()
     : max_length(0),
       is_autofilled(false),
@@ skipping 93 matching lines @@
           !iter->ReadString16(&field_data->name) ||
           !iter->ReadString16(&field_data->value) ||
           !iter->ReadString(&field_data->form_control_type) ||
           !iter->ReadString(&field_data->autocomplete_attribute) ||
           !iter->ReadSizeT(&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) ||
+          !ReadAsInt(iter, &field_data->text_direction) ||
+          !ReadStringVector(iter, &field_data->option_values) ||
+          !ReadStringVector(iter, &field_data->option_contents)) {
+        LOG(ERROR) << "Could not deserialize FormFieldData from pickle";
+        return false;
+      }
+      break;
+    }
+    case 2: {
+      if (!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->ReadSizeT(&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) ||
           !ReadAsInt(iter, &field_data->role) ||

[Lei Zhang, 2015/01/23 06:43:01]

I wish you put "role" at the end, so (de)serializing version 2 is the same as
version 1, but with one more bit of extra work. Oh well.

           !ReadAsInt(iter, &field_data->text_direction) ||
           !ReadStringVector(iter, &field_data->option_values) ||
           !ReadStringVector(iter, &field_data->option_contents)) {
         LOG(ERROR) << "Could not deserialize FormFieldData from pickle";
         return false;
       }
       break;
     }
     default: {
       LOG(ERROR) << "Unknown FormFieldData pickle version " << version;
@@ skipping 10 matching lines @@
             << " " << field.autocomplete_attribute << " " << 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