Improve autofill form matching.

components/autofill/core/common/autofill_data_validation.cc

 // Copyright 2014 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/autofill_data_validation.h"
 
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
 #include "url/gurl.h"
@@ skipping 17 matching lines @@
 bool IsValidGURL(const GURL& url) {
   return url.is_empty() || url.is_valid();
 }
 
 bool IsValidFormFieldData(const FormFieldData& field) {
   return IsValidString16(field.label) &&
          IsValidString16(field.name) &&
          IsValidString16(field.value) &&
          IsValidString(field.form_control_type) &&
          IsValidString(field.autocomplete_attribute) &&
-         IsValidString16Vector(field.option_values) &&
          IsValidString16Vector(field.option_contents);
 }
 
 bool IsValidFormData(const FormData& form) {
   if (!IsValidString16(form.name) ||
       !IsValidGURL(form.origin) ||
       !IsValidGURL(form.action))
     return false;
 
   if (form.fields.size() > kMaxListSize)
@@ skipping 51 matching lines @@
 
   for (const FormData& form : v) {
     if (!IsValidFormData(form))
       return false;
   }
 
   return true;
 }
 
 }  // namespace autofill