Fix for: State in small letters should be auto-filled from the profile....

chrome/browser/autofill/autofill_manager.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 "chrome/browser/autofill/autofill_manager.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/string16.h"
@@ skipping 602 matching lines @@
 
 void AutoFillManager::FillFormField(const AutoFillProfile* profile,
                                     AutoFillType type,
                                     webkit_glue::FormField* field) {
   DCHECK(profile);
   DCHECK(field);
 
   if (type.subgroup() == AutoFillType::PHONE_NUMBER) {
     FillPhoneNumberField(profile, field);
   } else {
-    field->set_value(profile->GetFieldText(type));
+    if (field->form_control_type() == ASCIIToUTF16("select-one"))
+      FillSelectOneField(profile, type, field);
+    else
+      field->set_value(profile->GetFieldText(type));
   }
 }
 
+void AutoFillManager::FillSelectOneField(const AutoFillProfile* profile,
+                                         AutoFillType type,
+                                         webkit_glue::FormField* field) {
+  DCHECK(profile);
+  DCHECK(field);
+  DCHECK(field->form_control_type() == ASCIIToUTF16("select-one"));
+  string16 selected_string = profile->GetFieldText(type);
+  std::string ascii_value = UTF16ToASCII(selected_string);
+  for (size_t i = 0; i < field->option_strings().size(); ++i) {
+    if (profile->GetFieldText(type) == field->option_strings()[i]) {
+      // An exact match - use it.
+      selected_string = profile->GetFieldText(type);
+      break;
+    }
+    if (!base::strcasecmp(UTF16ToASCII(field->option_strings()[i]).c_str(),
+                          ascii_value.c_str())) {
+      // A match, but not in the same case - save it for the case we won't
+      // find an exact match.
+      selected_string = field->option_strings()[i];
+    }
+  }
+  field->set_value(selected_string);
+}
+
+
 void AutoFillManager::FillPhoneNumberField(const AutoFillProfile* profile,
                                            webkit_glue::FormField* field) {
   // If we are filling a phone number, check to see if the size field
   // matches the "prefix" or "suffix" sizes and fill accordingly.
   string16 number = profile->GetFieldText(AutoFillType(PHONE_HOME_NUMBER));
   bool has_valid_suffix_and_prefix = (number.length() ==
       (kAutoFillPhoneNumberPrefixCount + kAutoFillPhoneNumberSuffixCount));
   if (has_valid_suffix_and_prefix &&
       field->size() == kAutoFillPhoneNumberPrefixCount) {
     number = number.substr(kAutoFillPhoneNumberPrefixOffset,
@@ skipping 19 matching lines @@
       continue;
 
     DeterminePossibleFieldTypes(form_structure);
     form_structures_.push_back(form_structure);
   }
 
   // If none of the forms were parsed, no use querying the server.
   if (!form_structures_.empty())
     download_manager_.StartQueryRequest(form_structures_);
 }