Fix KDE Wallet backward compatibility when (de)serializing FormData.

components/autofill/core/common/form_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_data.h"
 
 #include "base/pickle.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/common/form_field_data.h"
 
 namespace autofill {
 
 namespace {
 
-const int kPickleVersion = 1;
+const int kPickleVersion = 2;
 
 bool ReadGURL(PickleIterator* iter, GURL* url) {
   std::string spec;
   if (!iter->ReadString(&spec))
     return false;
 
   *url = GURL(spec);
   return true;
 }
 
@@ skipping 14 matching lines @@
   FormFieldData temp;
   for (int i = 0; i < size; ++i) {
     if (!DeserializeFormFieldData(iter, &temp))
       return false;
 
     fields->push_back(temp);
   }
   return true;
 }
 
+void LogDeserializationError(int version) {
+  LOG(ERROR) << "Could not deserialize version " << version
+             << " FormData from pickle.";

[Ilya Sherman, 2014/08/07 19:23:31]

nit: Please use DVLOG(1) here.  (I do see that the file is currently using
LOG(ERROR).  If you could update those throughout, that would be great :)

+}
+
 }  // namespace
 
 FormData::FormData()
     : user_submitted(false) {
 }
 
 FormData::FormData(const FormData& data)
     : name(data.name),
       origin(data.origin),
       action(data.action),
@@ skipping 48 matching lines @@
   pickle->WriteBool(form_data.user_submitted);
   SerializeFormFieldDataVector(form_data.fields, pickle);
 }
 
 bool DeserializeFormData(PickleIterator* iter, FormData* form_data) {
   int version;
   if (!iter->ReadInt(&version)) {
     LOG(ERROR) << "Bad pickle of FormData, no version present";
     return false;
   }
-

[Ilya Sherman, 2014/08/07 19:23:31]

nit: Please preserve this newline.

   switch (version) {
     case 1: {
+      base::string16 method;
+      if (!iter->ReadString16(&form_data->name) ||
+          !iter->ReadString16(&method) ||
+          !ReadGURL(iter, &form_data->origin) ||
+          !ReadGURL(iter, &form_data->action) ||
+          !iter->ReadBool(&form_data->user_submitted) ||
+          !DeserializeFormFieldDataVector(iter, &form_data->fields)) {
+        LogDeserializationError(version);
+        return false;
+      }
+      break;
+    }
+    case 2: {
       if (!iter->ReadString16(&form_data->name) ||
           !ReadGURL(iter, &form_data->origin) ||
           !ReadGURL(iter, &form_data->action) ||
           !iter->ReadBool(&form_data->user_submitted) ||
           !DeserializeFormFieldDataVector(iter, &form_data->fields)) {
-        LOG(ERROR) << "Could not deserialize FormData from pickle";
+        LogDeserializationError(version);
         return false;
       }
       break;
     }

[Ilya Sherman, 2014/08/07 19:23:31]

nit: No need for these curly braces.

     default: {
       LOG(ERROR) << "Unknown FormData pickle version " << version;
       return false;
     }
   }
   return true;
 }
 
 }  // namespace autofill