AutoFill: Parse HTMLLabel elements for form control element labels.

webkit/glue/form_field.cc

 // Copyright (c) 2010 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 "webkit/glue/form_field.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSelectElement.h"
@@ skipping 35 matching lines @@
                      const string16& form_control_type)
   : label_(label),
     name_(name),
     value_(value),
     form_control_type_(form_control_type) {
 }
 
 bool FormField::operator==(const FormField& field) const {
   // A FormField stores a value, but the value is not part of the identity of
   // the field, so we don't want to compare the values.
-  // TODO(jhawkins): Re-enable checking the field label for == once we parse
-  // labels again.
-  return (name_ == field.name_ &&
+  return (label_ == field.label_ &&
+          name_ == field.name_ &&
           form_control_type_ == field.form_control_type_);
 }
 
 bool FormField::operator!=(const FormField& field) const {
   return !operator==(field);
 }
 
 std::ostream& operator<<(std::ostream& os, const FormField& field) {
   return os
       << UTF16ToUTF8(field.label())
       << " "
       << UTF16ToUTF8(field.name())
       << " "
       << UTF16ToUTF8(field.value())
       << " "
       << UTF16ToUTF8(field.form_control_type());
 }
 
 }  // namespace webkit_glue