Fix the settings page for es-419 locale: Spanish (Latin America).

chrome/browser/autofill/autofill_country.cc

 // Copyright (c) 2011 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_country.h"
 
 #include <map>
 #include <utility>
 
 #include "base/scoped_ptr.h"
@@ skipping 368 matching lines @@
   std::string likely_locale;
   UErrorCode error_ignored = U_ZERO_ERROR;
   uloc_addLikelySubtags(locale.c_str(),
                         WriteInto(&likely_locale, kLocaleCapacity),
                         kLocaleCapacity,
                         &error_ignored);
 
   // Extract the country code.
   std::string country_code = icu::Locale(likely_locale.c_str()).getCountry();
 
-  // Default to the United States if we have no better guess.
-  return !country_code.empty() ? country_code : "US";
+  // Default to the United States if we have no better guess. Consider the
+  // country code invalid if it is empty or contains any character other
+  // than A-Z.
+  if (country_code.empty() ||
+      country_code.find_first_not_of("ABCDEFGHIJKLMNOPQRSTUVWXYZ") !=
+      std::string::npos)

[Ilya Sherman, 2011/03/08 10:35:18]

Probably the right check here is actually to see if the country code is in the
map of known countries:

if (!AutofillCountries::countries().count(country_code))
  return "US";

[satorux1, 2011/03/08 11:28:10]

Done.

+    return "US";
+  return country_code;
 }
 
 // static
 const std::string AutofillCountry::GetCountryCode(
     const string16& country, const std::string& locale) {
   // First, check for a few common synonyms.
   if (country == ASCIIToUTF16("United States of America"))
     return "US";
   if (country == ASCIIToUTF16("Great Britain") ||
       country == ASCIIToUTF16("UK"))
@@ skipping 52 matching lines @@
 
 AutofillCountry::AutofillCountry(const std::string& country_code,
                                  const string16& name,
                                  const string16& postal_code_label,
                                  const string16& state_label)
     : country_code_(country_code),
       name_(name),
       postal_code_label_(postal_code_label),
       state_label_(state_label) {
 }