Remove application locale cache in autofill code.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.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 "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
 #include "chrome/browser/ui/base_window.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
-#include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/personal_data_manager.h"
 #include "components/autofill/browser/risk/fingerprint.h"
 #include "components/autofill/browser/risk/proto/fingerprint.pb.h"
 #include "components/autofill/browser/validation.h"
 #include "components/autofill/browser/wallet/cart.h"
 #include "components/autofill/browser/wallet/full_wallet.h"
 #include "components/autofill/browser/wallet/instrument.h"
 #include "components/autofill/browser/wallet/wallet_address.h"
@@ skipping 90 matching lines @@
                  DetailInputs* inputs) {
   for (size_t i = 0; i < template_size; ++i) {
     const DetailInput* input = &input_template[i];
     inputs->push_back(*input);
   }
 }
 
 // Uses |group| to fill in the |initial_value| for all inputs in |all_inputs|
 // (an out-param).
 void FillInputFromFormGroup(FormGroup* group, DetailInputs* inputs) {
-  const std::string app_locale = AutofillCountry::ApplicationLocale();
   for (size_t j = 0; j < inputs->size(); ++j) {
-    (*inputs)[j].initial_value =
-        group->GetInfo((*inputs)[j].type, app_locale);
+    (*inputs)[j].initial_value = group->GetInfo(
+        (*inputs)[j].type, g_browser_process->GetApplicationLocale());

[Ilya Sherman, 2013/04/04 04:27:38]

nit: Please continue to cache this outside of the loop.  It's probably a minor
performance difference, but still, not much reason to call the method
repeatedly.  (This comment also applies to all of the other loops this change
affects.)

[jam, 2013/04/04 17:58:12]

Done.

   }
 }
 
 // Initializes |form_group| from user-entered data.
 void FillFormGroupFromOutputs(const DetailOutputMap& detail_outputs,
                               FormGroup* form_group) {
   for (DetailOutputMap::const_iterator iter = detail_outputs.begin();
        iter != detail_outputs.end(); ++iter) {
     if (!iter->second.empty())
       form_group->SetRawInfo(iter->first->type, iter->second);
@@ skipping 1490 matching lines @@
     const std::vector<CreditCard*>& cards = manager->credit_cards();
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     for (size_t i = 0; i < cards.size(); ++i) {
       suggested_cc_.AddKeyedItemWithIcon(
           cards[i]->guid(),
           cards[i]->Label(),
           rb.GetImageNamed(cards[i]->IconResourceId()));
     }
 
     const std::vector<AutofillProfile*>& profiles = manager->GetProfiles();
-    const std::string app_locale = AutofillCountry::ApplicationLocale();
     for (size_t i = 0; i < profiles.size(); ++i) {
       if (!IsCompleteProfile(*profiles[i]))
         continue;
 
       // Add all email addresses.
       std::vector<string16> values;
-      profiles[i]->GetMultiInfo(EMAIL_ADDRESS, app_locale, &values);
+      profiles[i]->GetMultiInfo(
+          EMAIL_ADDRESS, g_browser_process->GetApplicationLocale(), &values);
       for (size_t j = 0; j < values.size(); ++j) {
         if (!values[j].empty())
           suggested_email_.AddKeyedItem(profiles[i]->guid(), values[j]);
       }
 
       // Don't add variants for addresses: the email variants are handled above,
       // name is part of credit card and we'll just ignore phone number
       // variants.
       suggested_billing_.AddKeyedItem(profiles[i]->guid(),
                                       profiles[i]->Label());
@@ skipping 12 matching lines @@
   suggested_email_.AddKeyedItem(
       std::string(),
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_EMAIL_ADDRESS));
   suggested_shipping_.AddKeyedItem(
       std::string(),
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_SHIPPING_ADDRESS));
 }
 
 bool AutofillDialogControllerImpl::IsCompleteProfile(
     const AutofillProfile& profile) {
-  const std::string app_locale = AutofillCountry::ApplicationLocale();
   for (size_t i = 0; i < requested_shipping_fields_.size(); ++i) {
     AutofillFieldType type = requested_shipping_fields_[i].type;
     if (type != ADDRESS_HOME_LINE2 &&
-        profile.GetInfo(type, app_locale).empty()) {
+        profile.GetInfo(type,
+                        g_browser_process->GetApplicationLocale()).empty()) {
       return false;
     }
   }
 
   return true;
 }
 
 void AutofillDialogControllerImpl::FillOutputForSectionWithComparator(
     DialogSection section,
     const InputFieldComparator& compare) {
@@ skipping 52 matching lines @@
     const FormGroup& form_group,
     size_t variant,
     DialogSection section,
     const InputFieldComparator& compare) {
   for (size_t i = 0; i < form_structure_.field_count(); ++i) {
     AutofillField* field = form_structure_.field(i);
     // Only fill in data that is associated with this section.
     const DetailInputs& inputs = RequestedFieldsForSection(section);
     for (size_t j = 0; j < inputs.size(); ++j) {
       if (compare.Run(inputs[j], *field)) {
-        form_group.FillFormField(*field, variant, field);
+        form_group.FillFormField(
+            *field, variant, g_browser_process->GetApplicationLocale(), field);
         break;
       }
     }
   }
 }
 
 void AutofillDialogControllerImpl::SetCvcResult(const string16& cvc) {
   for (size_t i = 0; i < form_structure_.field_count(); ++i) {
     AutofillField* field = form_structure_.field(i);
     if (field->type() == CREDIT_CARD_VERIFICATION_CODE) {
@@ skipping 273 matching lines @@
         AutofillMetrics::DIALOG_USER_SIGNED_IN_NO_WALLET_NO_AUTOFILL;
   }
 
   // Has Wallet items.
   return has_autofill_profiles ?
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_HAS_AUTOFILL :
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_NO_AUTOFILL;
 }
 
 }  // namespace autofill