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

The problem was introduced by https://codereview.chromium.org/365783002

BUG=404615

Review URL: https://codereview.chromium.org/443873011

Cr-Commit-Position: refs/heads/master@{#290677}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290677 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 142 insertions, 4 deletions

diff --git a/components/autofill/core/common/form_data.cc b/components/autofill/core/common/form_data.cc
index 83d8173..b720ae40 100644
--- a/components/autofill/core/common/form_data.cc
+++ b/components/autofill/core/common/form_data.cc
@@ -13,7 +13,7 @@ namespace autofill {
 
 namespace {
 
-const int kPickleVersion = 1;
+const int kPickleVersion = 2;
 
 bool ReadGURL(PickleIterator* iter, GURL* url) {
   std::string spec;
@@ -48,6 +48,11 @@ bool DeserializeFormFieldDataVector(PickleIterator* iter,
   return true;
 }
 
+void LogDeserializationError(int version) {
+  DVLOG(1) << "Could not deserialize version " << version
+             << " FormData from pickle.";
+}
+
 }  // namespace
 
 FormData::FormData()
@@ -113,24 +118,36 @@ void SerializeFormData(const FormData& form_data, Pickle* pickle) {
 bool DeserializeFormData(PickleIterator* iter, FormData* form_data) {
   int version;
   if (!iter->ReadInt(&version)) {
-    LOG(ERROR) << "Bad pickle of FormData, no version present";
+    DVLOG(1) << "Bad pickle of FormData, no version present";
     return false;
   }
 
   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)) {
-        LOG(ERROR) << "Could not deserialize FormData from pickle";
+        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)) {
+        LogDeserializationError(version);
+        return false;
+      }
+      break;
     default: {
-      LOG(ERROR) << "Unknown FormData pickle version " << version;
+      DVLOG(1) << "Unknown FormData pickle version " << version;
       return false;
     }
   }
diff --git a/components/autofill/core/common/form_data_unittest.cc b/components/autofill/core/common/form_data_unittest.cc
index 73d8256..4f57129 100644
--- a/components/autofill/core/common/form_data_unittest.cc
+++ b/components/autofill/core/common/form_data_unittest.cc
@@ -6,8 +6,45 @@
 
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/autofill/core/common/form_field_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace {
+
+// This function serializes the form data into the pickle in version one format.
+// It should always be possible to deserialize it using DeserializeFormData(),
+// even when version changes. See kPickleVersion in form_data.cc.
+void SerializeInVersion1Format(const autofill::FormData& form_data,
+                               Pickle* pickle) {
+  pickle->WriteInt(1);
+  pickle->WriteString16(form_data.name);
+  base::string16 method(base::ASCIIToUTF16("POST"));
+  pickle->WriteString16(method);
+  pickle->WriteString(form_data.origin.spec());
+  pickle->WriteString(form_data.action.spec());
+  pickle->WriteBool(form_data.user_submitted);
+  pickle->WriteInt(static_cast<int>(form_data.fields.size()));
+  for (size_t i = 0; i < form_data.fields.size(); ++i) {
+    SerializeFormFieldData(form_data.fields[i], pickle);
+  }
+}
+
+// This function serializes the form data into the pickle in incorrect format
+// (no version number).
+void SerializeIncorrectFormat(const autofill::FormData& form_data,
+                               Pickle* pickle) {
+  pickle->WriteString16(form_data.name);
+  pickle->WriteString(form_data.origin.spec());
+  pickle->WriteString(form_data.action.spec());
+  pickle->WriteBool(form_data.user_submitted);
+  pickle->WriteInt(static_cast<int>(form_data.fields.size()));
+  for (size_t i = 0; i < form_data.fields.size(); ++i) {
+    SerializeFormFieldData(form_data.fields[i], pickle);
+  }
+}
+
+}
+
 namespace autofill {
 
 TEST(FormDataTest, SerializeAndDeserialize) {
@@ -53,4 +90,88 @@ TEST(FormDataTest, SerializeAndDeserialize) {
   EXPECT_EQ(actual, data);
 }
 
+TEST(FormDataTest, Serialize_v1_Deserialize_vCurrent) {
+  FormData data;
+  data.name = base::ASCIIToUTF16("name");
+  data.origin = GURL("origin");
+  data.action = GURL("action");
+  data.user_submitted = true;
+
+  FormFieldData field_data;
+  field_data.label = base::ASCIIToUTF16("label");
+  field_data.name = base::ASCIIToUTF16("name");
+  field_data.value = base::ASCIIToUTF16("value");
+  field_data.form_control_type = "password";
+  field_data.autocomplete_attribute = "off";
+  field_data.max_length = 200;
+  field_data.is_autofilled = true;
+  field_data.is_checked = true;
+  field_data.is_checkable = true;
+  field_data.is_focusable = true;
+  field_data.should_autocomplete = false;
+  field_data.text_direction = base::i18n::RIGHT_TO_LEFT;
+  field_data.option_values.push_back(base::ASCIIToUTF16("First"));
+  field_data.option_values.push_back(base::ASCIIToUTF16("Second"));
+  field_data.option_contents.push_back(base::ASCIIToUTF16("First"));
+  field_data.option_contents.push_back(base::ASCIIToUTF16("Second"));
+
+  data.fields.push_back(field_data);
+
+  // Change a few fields.
+  field_data.max_length = 150;
+  field_data.option_values.push_back(base::ASCIIToUTF16("Third"));
+  field_data.option_contents.push_back(base::ASCIIToUTF16("Third"));
+  data.fields.push_back(field_data);
+
+  Pickle pickle;
+  SerializeInVersion1Format(data, &pickle);
+
+  PickleIterator iter(pickle);
+  FormData actual;
+  EXPECT_TRUE(DeserializeFormData(&iter, &actual));
+
+  EXPECT_EQ(actual, data);
+}
+
+TEST(FormDataTest, SerializeIncorrectFormatAndDeserialize) {
+  FormData data;
+  data.name = base::ASCIIToUTF16("name");
+  data.origin = GURL("origin");
+  data.action = GURL("action");
+  data.user_submitted = true;
+
+  FormFieldData field_data;
+  field_data.label = base::ASCIIToUTF16("label");
+  field_data.name = base::ASCIIToUTF16("name");
+  field_data.value = base::ASCIIToUTF16("value");
+  field_data.form_control_type = "password";
+  field_data.autocomplete_attribute = "off";
+  field_data.max_length = 200;
+  field_data.is_autofilled = true;
+  field_data.is_checked = true;
+  field_data.is_checkable = true;
+  field_data.is_focusable = true;
+  field_data.should_autocomplete = false;
+  field_data.text_direction = base::i18n::RIGHT_TO_LEFT;
+  field_data.option_values.push_back(base::ASCIIToUTF16("First"));
+  field_data.option_values.push_back(base::ASCIIToUTF16("Second"));
+  field_data.option_contents.push_back(base::ASCIIToUTF16("First"));
+  field_data.option_contents.push_back(base::ASCIIToUTF16("Second"));
+
+  data.fields.push_back(field_data);
+
+  // Change a few fields.
+  field_data.max_length = 150;
+  field_data.option_values.push_back(base::ASCIIToUTF16("Third"));
+  field_data.option_contents.push_back(base::ASCIIToUTF16("Third"));
+  data.fields.push_back(field_data);
+
+  Pickle pickle;
+  SerializeIncorrectFormat(data, &pickle);
+
+  PickleIterator iter(pickle);
+  FormData actual;
+  EXPECT_FALSE(DeserializeFormData(&iter, &actual));
+}
+
 }  // namespace autofill