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

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"
@@ skipping 46 matching lines @@
 
 FormData::FormData()
     : user_submitted(false) {
 }
 
 FormData::FormData(const FormData& data)
     : name(data.name),
       origin(data.origin),
       action(data.action),
       user_submitted(data.user_submitted),
+      username_field(data.username_field),
+      password_field(data.password_field),
       fields(data.fields) {
 }
 
 FormData::~FormData() {
 }
 
 bool FormData::operator==(const FormData& form) const {
-  return name == form.name &&
-         origin == form.origin &&
-         action == form.action &&
+  return name == form.name && origin == form.origin && action == form.action &&
          user_submitted == form.user_submitted &&
-         fields == form.fields;
+         username_field == form.username_field &&
+         password_field == form.password_field && fields == form.fields;
 }
 
 bool FormData::operator!=(const FormData& form) const {
   return !operator==(form);
 }
 
 bool FormData::operator<(const FormData& form) const {
   if (name != form.name)
     return name < form.name;
   if (origin != form.origin)
     return origin < form.origin;
   if (action != form.action)
     return action < form.action;
   if (user_submitted != form.user_submitted)
     return user_submitted < form.user_submitted;
+  if (username_field != form.username_field)
+    return username_field < form.username_field;
+  if (password_field != form.password_field)
+    return password_field < form.password_field;
   return fields < form.fields;
 }
 
 std::ostream& operator<<(std::ostream& os, const FormData& form) {
-  os << base::UTF16ToUTF8(form.name) << " "
-     << form.origin << " "
-     << form.action << " "
-     << form.user_submitted << " "
+  os << base::UTF16ToUTF8(form.name) << " " << form.origin << " " << form.action
+     << " " << form.user_submitted << " " << form.username_field << " "
+     << form.password_field << " "
      << "Fields:";
   for (size_t i = 0; i < form.fields.size(); ++i) {
     os << form.fields[i] << ",";
   }
   return os;
 }
 
 void SerializeFormData(const FormData& form_data, Pickle* pickle) {
   pickle->WriteInt(kPickleVersion);
   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);
   SerializeFormFieldDataVector(form_data.fields, pickle);
 }
 
 bool DeserializeFormData(PickleIterator* iter, FormData* form_data) {
   int version;
   if (!iter->ReadInt(&version)) {
     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) ||
+          !iter->ReadString16(&method) || !ReadGURL(iter, &form_data->origin) ||
           !ReadGURL(iter, &form_data->action) ||
           !iter->ReadBool(&form_data->user_submitted) ||
+          !DeserializeFormFieldData(iter, &form_data->username_field) ||
+          !DeserializeFormFieldData(iter, &form_data->password_field) ||
           !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) ||
+          !DeserializeFormFieldData(iter, &form_data->username_field) ||
+          !DeserializeFormFieldData(iter, &form_data->password_field) ||
           !DeserializeFormFieldDataVector(iter, &form_data->fields)) {
         LogDeserializationError(version);
         return false;
       }
       break;
     default: {
       DVLOG(1) << "Unknown FormData pickle version " << version;
       return false;
     }
   }
   return true;
 }
 
 }  // namespace autofill