[Password manager] Relplace the FormFieldData vector from autofill::FormData with named fields…

components/autofill/core/common/form_data_unittest.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/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);
+  SerializeFormFieldData(form_data.username_field, pickle);
+  SerializeFormFieldData(form_data.password_field, pickle);
   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);
+  SerializeFormFieldData(form_data.username_field, pickle);
+  SerializeFormFieldData(form_data.password_field, pickle);
   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 {
 
@@ skipping 118 matching lines @@
 
   Pickle pickle;
   SerializeIncorrectFormat(data, &pickle);
 
   PickleIterator iter(pickle);
   FormData actual;
   EXPECT_FALSE(DeserializeFormData(&iter, &actual));
 }
 
 }  // namespace autofill