Remove application locale cache in autofill code.

chrome/browser/ui/webui/options/autofill_options_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/autofill_options_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/country_combobox_model.h"
 #include "chrome/common/url_constants.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/browser/personal_data_manager.h"
 #include "components/autofill/browser/phone_number_i18n.h"
 #include "components/autofill/common/autofill_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/webui/web_ui_util.h"
 
 namespace {
 
 // Sets data related to the country <select>.
 void SetCountryData(DictionaryValue* localized_strings) {
-  std::string app_locale = AutofillCountry::ApplicationLocale();
-  std::string default_country_code =
-      AutofillCountry::CountryCodeForLocale(app_locale);
+  std::string default_country_code = AutofillCountry::CountryCodeForLocale(
+      g_browser_process->GetApplicationLocale());
   localized_strings->SetString("defaultCountryCode", default_country_code);
 
   autofill::CountryComboboxModel model;
   const std::vector<AutofillCountry*>& countries = model.countries();
 
   // An ordered list of options to show in the <select>.
   scoped_ptr<ListValue> country_list(new ListValue());
   // A dictionary of postal code and state info, keyed on country code.
   scoped_ptr<DictionaryValue> country_data(new DictionaryValue());
   for (size_t i = 0; i < countries.size(); ++i) {
@@ skipping 143 matching lines @@
 void RemoveDuplicatePhoneNumberAtIndex(size_t index,
                                        const std::string& country_code,
                                        ListValue* list) {
   string16 new_value;
   if (!list->GetString(index, &new_value)) {
     NOTREACHED() << "List should have a value at index " << index;
     return;
   }
 
   bool is_duplicate = false;
+  std::string app_locale = g_browser_process->GetApplicationLocale();
   for (size_t i = 0; i < list->GetSize() && !is_duplicate; ++i) {
     if (i == index)
       continue;
 
     string16 existing_value;
     if (!list->GetString(i, &existing_value)) {
       NOTREACHED() << "List should have a value at index " << i;
       continue;
     }
-    is_duplicate = autofill_i18n::PhoneNumbersMatch(new_value,
-                                                    existing_value,
-                                                    country_code);
+    is_duplicate = autofill_i18n::PhoneNumbersMatch(
+        new_value, existing_value, country_code, app_locale);
   }
 
   if (is_duplicate)
     list->Remove(index, NULL);
 }
 
 scoped_ptr<ListValue> ValidatePhoneArguments(const ListValue* args) {
   size_t index = 0;
   std::string country_code;
   const ListValue* extracted_list = NULL;
@@ skipping 357 matching lines @@
 
   web_ui()->CallJavascriptFunction(
     "AutofillEditAddressOverlay.setValidatedPhoneNumbers", *list_value);
 }
 
 bool AutofillOptionsHandler::IsPersonalDataLoaded() const {
   return personal_data_ && personal_data_->IsDataLoaded();
 }
 
 }  // namespace options