CountryNames: Separate data creation from usage

components/autofill/core/browser/autofill_field.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/browser/autofill_field.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/i18n/string_search.h"
@@ skipping 156 matching lines @@
   if (!full.empty() && SetSelectControlValueSubstringMatch(full, field)) {
     return true;
   }
 
   // Then try an inexact match of the abbreviation name.
   return !abbreviation.empty() &&
       SetSelectControlValueTokenMatch(abbreviation, field);
 }
 
 bool FillCountrySelectControl(const base::string16& value,
-                              const std::string& app_locale,
                               FormFieldData* field_data) {
-  std::string country_code =
-      CountryNames::GetInstance()->GetCountryCode(value, app_locale);
+  std::string country_code = CountryNames::GetInstance()->GetCountryCode(value);
   if (country_code.empty())
     return false;
 
   DCHECK_EQ(field_data->option_values.size(),
             field_data->option_contents.size());
   for (size_t i = 0; i < field_data->option_values.size(); ++i) {
     // Canonicalize each <option> value to a country code, and compare to the
     // target country code.
     base::string16 value = field_data->option_values[i];
     base::string16 contents = field_data->option_contents[i];
-    if (country_code ==
-            CountryNames::GetInstance()->GetCountryCode(value, app_locale) ||
-        country_code ==
-            CountryNames::GetInstance()->GetCountryCode(contents, app_locale)) {
+    if (country_code == CountryNames::GetInstance()->GetCountryCode(value) ||
+        country_code == CountryNames::GetInstance()->GetCountryCode(contents)) {
       field_data->value = value;
       return true;
     }
   }
 
   return false;
 }
 
 bool FillExpirationMonthSelectControl(const base::string16& value,
                                       const std::string& app_locale,
@@ skipping 137 matching lines @@
     return FillExpirationMonthSelectControl(value, app_locale, field);
 
   // Search for exact matches.
   if (SetSelectControlValue(value, field))
     return true;
 
   // If that fails, try specific fallbacks based on the field type.
   if (storable_type == ADDRESS_HOME_STATE) {
     return FillStateSelectControl(value, field);
   } else if (storable_type == ADDRESS_HOME_COUNTRY) {
-    return FillCountrySelectControl(value, app_locale, field);
+    return FillCountrySelectControl(value, field);
   } else if (storable_type == CREDIT_CARD_EXP_2_DIGIT_YEAR ||
              storable_type == CREDIT_CARD_EXP_4_DIGIT_YEAR) {
     return FillYearSelectControl(value, field);
   } else if (storable_type == CREDIT_CARD_TYPE) {
     return FillCreditCardTypeSelectControl(value, field);
   }
 
   return false;
 }
 
@@ skipping 233 matching lines @@
     if (compare.StringsEqual(value_stripped, option_contents)) {
       if (index)
         *index = i;
       return true;
     }
   }
   return false;
 }
 
 }  // namespace autofill