Remove application locale cache in autofill code.

components/autofill/browser/personal_data_manager.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 "components/autofill/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "components/autofill/browser/autofill-inl.h"
-#include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_field.h"
 #include "components/autofill/browser/autofill_metrics.h"
 #include "components/autofill/browser/form_group.h"
 #include "components/autofill/browser/form_structure.h"
 #include "components/autofill/browser/personal_data_manager_observer.h"
 #include "components/autofill/browser/phone_number.h"
 #include "components/autofill/browser/phone_number_i18n.h"
 #include "components/autofill/browser/validation.h"
 #include "components/autofill/common/autofill_pref_names.h"
 #include "components/user_prefs/user_prefs.h"
@@ skipping 74 matching lines @@
   // Abandon the import if an email address value shows up in a field that is
   // not an email address.
   if (field_type != EMAIL_ADDRESS && autofill::IsValidEmailAddress(value))
     return false;
 
   return true;
 }
 
 }  // namespace
 
-PersonalDataManager::PersonalDataManager()
+PersonalDataManager::PersonalDataManager(const std::string& app_locale)
     : browser_context_(NULL),
       is_data_loaded_(false),
       pending_profiles_query_(0),
       pending_creditcards_query_(0),
+      app_locale_(app_locale),
       metric_logger_(new AutofillMetrics),
       has_logged_profile_count_(false) {}
 
 void PersonalDataManager::Init(BrowserContext* browser_context) {
   browser_context_ = browser_context;
   metric_logger_->LogIsAutofillEnabledAtStartup(IsAutofillEnabled());
 
   scoped_refptr<AutofillWebDataService> autofill_data(
       AutofillWebDataService::FromBrowserContext(browser_context_));
 
@@ skipping 83 matching lines @@
   // possible to import.
   int importable_credit_card_fields = 0;
 
   // Detect and discard forms with multiple fields of the same type.
   std::set<AutofillFieldType> types_seen;
 
   // We only set complete phone, so aggregate phone parts in these vars and set
   // complete at the end.
   PhoneNumber::PhoneCombineHelper home;
 
-  const std::string app_locale = AutofillCountry::ApplicationLocale();
   for (size_t i = 0; i < form.field_count(); ++i) {
     const AutofillField* field = form.field(i);
     string16 value = CollapseWhitespace(field->value, false);
 
     // If we don't know the type of the field, or the user hasn't entered any
     // information into the field, then skip it.
     if (!field->IsFieldFillable() || value.empty())
       continue;
 
     AutofillFieldType field_type = field->type();
     FieldTypeGroup group(AutofillType(field_type).group());
 
     // If the |field_type| and |value| don't pass basic validity checks then
     // abandon the import.
     if (!IsValidFieldTypeAndValue(types_seen, field_type, value)) {
       imported_profile.reset();
       local_imported_credit_card.reset();
       break;
     }
 
     types_seen.insert(field_type);
 
     if (group == AutofillType::CREDIT_CARD) {
       if (LowerCaseEqualsASCII(field->form_control_type, "month")) {
         DCHECK_EQ(CREDIT_CARD_EXP_MONTH, field_type);
         local_imported_credit_card->SetInfoForMonthInputType(value);
       } else {
-        local_imported_credit_card->SetInfo(field_type, value, app_locale);
+        local_imported_credit_card->SetInfo(field_type, value, app_locale_);
       }
       ++importable_credit_card_fields;
     } else {
       // We need to store phone data in the variables, before building the whole
       // number at the end. The rest of the fields are set "as is".
       // If the fields are not the phone fields in question home.SetInfo() is
       // going to return false.
       if (!home.SetInfo(field_type, value))
-        imported_profile->SetInfo(field_type, value, app_locale);
+        imported_profile->SetInfo(field_type, value, app_locale_);
 
       // Reject profiles with invalid country information.
       if (field_type == ADDRESS_HOME_COUNTRY &&
           !value.empty() && imported_profile->CountryCode().empty()) {
         imported_profile.reset();
         break;
       }
     }
   }
 
   // Construct the phone number. Reject the profile if the number is invalid.
   if (imported_profile.get() && !home.IsEmpty()) {
     string16 constructed_number;
-    if (!home.ParseNumber(*imported_profile, app_locale, &constructed_number) ||
+    if (!home.ParseNumber(*imported_profile, app_locale_,
+                          &constructed_number) ||
         !imported_profile->SetInfo(PHONE_HOME_WHOLE_NUMBER, constructed_number,
-                                   app_locale)) {
+                                   app_locale_)) {
       imported_profile.reset();
     }
   }
 
   // Reject the profile if minimum address and validation requirements are not
   // met.
   if (imported_profile.get() && !IsValidLearnableProfile(*imported_profile))
     imported_profile.reset();
 
   // Reject the credit card if we did not detect enough filled credit card
   // fields or if the credit card number does not seem to be valid.
   if (local_imported_credit_card.get() &&
       !local_imported_credit_card->IsComplete()) {
     local_imported_credit_card.reset();
   }
 
   // Don't import if we already have this info.
   // Don't present an infobar if we have already saved this card number.
   bool merged_credit_card = false;
   if (local_imported_credit_card.get()) {
     for (std::vector<CreditCard*>::const_iterator iter = credit_cards_.begin();
          iter != credit_cards_.end();
          ++iter) {
       if ((*iter)->UpdateFromImportedCard(*local_imported_credit_card.get(),
-                                          app_locale)) {
+                                          app_locale_)) {
         merged_credit_card = true;
         UpdateCreditCard(**iter);
         local_imported_credit_card.reset();
         break;
       }
     }
   }
 
   if (imported_profile.get()) {
     // We always save imported profiles.
     SaveImportedProfile(*imported_profile);
   }
   *imported_credit_card = local_imported_credit_card.release();
 
   if (imported_profile.get() || *imported_credit_card || merged_credit_card) {
     return true;
   } else {
     FOR_EACH_OBSERVER(PersonalDataManagerObserver, observers_,
                       OnInsufficientFormData());
     return false;
   }
 }
 
 void PersonalDataManager::AddProfile(const AutofillProfile& profile) {
   if (browser_context_->IsOffTheRecord())
     return;
 
-  if (profile.IsEmpty())
+  if (profile.IsEmpty(app_locale_))
     return;
 
   // Don't add an existing profile.
   if (FindByGUID<AutofillProfile>(web_profiles_, profile.guid()))
     return;
 
   scoped_refptr<AutofillWebDataService> autofill_data(
       AutofillWebDataService::FromBrowserContext(browser_context_));
   if (!autofill_data.get())
     return;
 
   // Don't add a duplicate.
   if (FindByContents(web_profiles_, profile))
     return;
 
   // Add the new profile to the web database.
   autofill_data->AddAutofillProfile(profile);
 
   // Refresh our local cache and send notifications to observers.
   Refresh();
 }
 
 void PersonalDataManager::UpdateProfile(const AutofillProfile& profile) {
   if (browser_context_->IsOffTheRecord())
     return;
 
   if (!FindByGUID<AutofillProfile>(web_profiles_, profile.guid()))
     return;
 
-  if (profile.IsEmpty()) {
+  if (profile.IsEmpty(app_locale_)) {
     RemoveByGUID(profile.guid());
     return;
   }
 
   scoped_refptr<AutofillWebDataService> autofill_data(
       AutofillWebDataService::FromBrowserContext(browser_context_));
   if (!autofill_data.get())
     return;
 
   // Make the update.
@@ skipping 11 matching lines @@
     if ((*iter)->guid() == guid)
       return *iter;
   }
   return NULL;
 }
 
 void PersonalDataManager::AddCreditCard(const CreditCard& credit_card) {
   if (browser_context_->IsOffTheRecord())
     return;
 
-  if (credit_card.IsEmpty())
+  if (credit_card.IsEmpty(app_locale_))
     return;
 
   if (FindByGUID<CreditCard>(credit_cards_, credit_card.guid()))
     return;
 
   scoped_refptr<AutofillWebDataService> autofill_data(
       AutofillWebDataService::FromBrowserContext(browser_context_));
   if (!autofill_data.get())
     return;
 
   // Don't add a duplicate.
   if (FindByContents(credit_cards_, credit_card))
     return;
 
   // Add the new credit card to the web database.
   autofill_data->AddCreditCard(credit_card);
 
   // Refresh our local cache and send notifications to observers.
   Refresh();
 }
 
 void PersonalDataManager::UpdateCreditCard(const CreditCard& credit_card) {
   if (browser_context_->IsOffTheRecord())
     return;
 
   if (!FindByGUID<CreditCard>(credit_cards_, credit_card.guid()))
     return;
 
-  if (credit_card.IsEmpty()) {
+  if (credit_card.IsEmpty(app_locale_)) {
     RemoveByGUID(credit_card.guid());
     return;
   }
 
   scoped_refptr<AutofillWebDataService> autofill_data(
       AutofillWebDataService::FromBrowserContext(browser_context_));
   if (!autofill_data.get())
     return;
 
   // Make the update.
@@ skipping 31 matching lines @@
   for (std::vector<CreditCard*>::iterator iter = credit_cards_.begin();
        iter != credit_cards_.end(); ++iter) {
     if ((*iter)->guid() == guid)
       return *iter;
   }
   return NULL;
 }
 
 void PersonalDataManager::GetNonEmptyTypes(
     FieldTypeSet* non_empty_types) {
-  const std::string app_locale = AutofillCountry::ApplicationLocale();
   const std::vector<AutofillProfile*>& profiles = GetProfiles();
   for (std::vector<AutofillProfile*>::const_iterator iter = profiles.begin();
        iter != profiles.end(); ++iter) {
-    (*iter)->GetNonEmptyTypes(app_locale, non_empty_types);
+    (*iter)->GetNonEmptyTypes(app_locale_, non_empty_types);
   }
 
   for (ScopedVector<CreditCard>::const_iterator iter = credit_cards_.begin();
        iter != credit_cards_.end(); ++iter) {
-    (*iter)->GetNonEmptyTypes(app_locale, non_empty_types);
+    (*iter)->GetNonEmptyTypes(app_locale_, non_empty_types);
   }
 }
 
 bool PersonalDataManager::IsDataLoaded() const {
   return is_data_loaded_;
 }
 
 const std::vector<AutofillProfile*>& PersonalDataManager::GetProfiles() {
   if (!components::UserPrefs::Get(browser_context_)->GetBoolean(
           prefs::kAutofillAuxiliaryProfilesEnabled)) {
@@ skipping 32 matching lines @@
     std::vector<string16>* values,
     std::vector<string16>* labels,
     std::vector<string16>* icons,
     std::vector<GUIDPair>* guid_pairs) {
   values->clear();
   labels->clear();
   icons->clear();
   guid_pairs->clear();
 
   const std::vector<AutofillProfile*>& profiles = GetProfiles();
-  const std::string app_locale = AutofillCountry::ApplicationLocale();
   std::vector<AutofillProfile*> matched_profiles;
   for (std::vector<AutofillProfile*>::const_iterator iter = profiles.begin();
        iter != profiles.end(); ++iter) {
     AutofillProfile* profile = *iter;
 
     // The value of the stored data for this field type in the |profile|.
     std::vector<string16> multi_values;
-    profile->GetMultiInfo(type, app_locale, &multi_values);
+    profile->GetMultiInfo(type, app_locale_, &multi_values);
 
     for (size_t i = 0; i < multi_values.size(); ++i) {
       if (!field_is_autofilled) {
         // Suggest data that starts with what the user has typed.
         if (!multi_values[i].empty() &&
             StartsWith(multi_values[i], field_contents, false)) {
           matched_profiles.push_back(profile);
           values->push_back(multi_values[i]);
           guid_pairs->push_back(GUIDPair(profile->guid(), i));
         }
@@ skipping 44 matching lines @@
   icons->resize(values->size());
 }
 
 void PersonalDataManager::GetCreditCardSuggestions(
     AutofillFieldType type,
     const string16& field_contents,
     std::vector<string16>* values,
     std::vector<string16>* labels,
     std::vector<string16>* icons,
     std::vector<GUIDPair>* guid_pairs) {
-  const std::string app_locale = AutofillCountry::ApplicationLocale();
   for (std::vector<CreditCard*>::const_iterator iter = credit_cards().begin();
        iter != credit_cards().end(); ++iter) {
     CreditCard* credit_card = *iter;
 
     // The value of the stored data for this field type in the |credit_card|.
-    string16 creditcard_field_value = credit_card->GetInfo(type, app_locale);
+    string16 creditcard_field_value = credit_card->GetInfo(type, app_locale_);
     if (!creditcard_field_value.empty() &&
         StartsWith(creditcard_field_value, field_contents, false)) {
       if (type == CREDIT_CARD_NUMBER)
         creditcard_field_value = credit_card->ObfuscatedNumber();
 
       string16 label;
       if (credit_card->number().empty()) {
         // If there is no CC number, return name to show something.
-        label = credit_card->GetInfo(CREDIT_CARD_NAME, app_locale);
+        label = credit_card->GetInfo(CREDIT_CARD_NAME, app_locale_);
       } else {
         label = kCreditCardPrefix;
         label.append(credit_card->LastFourDigits());
       }
 
       values->push_back(creditcard_field_value);
       labels->push_back(label);
       icons->push_back(UTF8ToUTF16(credit_card->type()));
       guid_pairs->push_back(GUIDPair(credit_card->guid(), 0));
     }
@@ skipping 28 matching lines @@
       !autofill::IsValidZip(zip))
     return false;
 
   return true;
 }
 
 // static
 bool PersonalDataManager::MergeProfile(
     const AutofillProfile& profile,
     const std::vector<AutofillProfile*>& existing_profiles,
+    const std::string& app_locale,
     std::vector<AutofillProfile>* merged_profiles) {
   merged_profiles->clear();
 
   // Set to true if |profile| is merged into |existing_profiles|.
   bool merged = false;
 
   // If we have already saved this address, merge in any missing values.
   // Only merge with the first match.
   for (std::vector<AutofillProfile*>::const_iterator iter =
            existing_profiles.begin();
        iter != existing_profiles.end(); ++iter) {
     if (!merged) {
       if (!profile.PrimaryValue().empty() &&
           StringToLowerASCII((*iter)->PrimaryValue()) ==
               StringToLowerASCII(profile.PrimaryValue())) {
         merged = true;
-        (*iter)->OverwriteWithOrAddTo(profile);
+        (*iter)->OverwriteWithOrAddTo(profile, app_locale);
       }
     }
     merged_profiles->push_back(**iter);
   }
 
   // If the new profile was not merged with an existing one, add it to the list.
   if (!merged)
     merged_profiles->push_back(profile);
 
   return merged;
 }
 
 void PersonalDataManager::SetProfiles(std::vector<AutofillProfile>* profiles) {
   if (browser_context_->IsOffTheRecord())
     return;
 
   // Remove empty profiles from input.
-  profiles->erase(
-      std::remove_if(profiles->begin(), profiles->end(),
-                     std::mem_fun_ref(&AutofillProfile::IsEmpty)),
-      profiles->end());
+  for (std::vector<AutofillProfile>::iterator i = profiles->begin();

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

nit: Please use "it" for the iterator name.

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

Done.

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

Done.

+       i != profiles->end();) {
+    if (i->IsEmpty(app_locale_)) {
+      profiles->erase(i);
+    } else {
+      i++;
+    }

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

nit: No need for curly braces.

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

yeah, i prefer having them when there's an else. the style guide doesn't set a
rule for this

[Ilya Sherman, 2013/04/04 23:00:40]

The style guide might not set a rule for this, but Autofill code pretty
consistently omits them.

+  }
 
   // Ensure that profile labels are up to date.  Currently, sync relies on
   // labels to identify a profile.
   // TODO(dhollowa): We need to deprecate labels and update the way sync
   // identifies profiles.
   std::vector<AutofillProfile*> profile_pointers(profiles->size());
   std::transform(profiles->begin(), profiles->end(), profile_pointers.begin(),
       address_of<AutofillProfile>);
   AutofillProfile::AdjustInferredLabels(&profile_pointers);
 
@@ skipping 36 matching lines @@
   // Refresh our local cache and send notifications to observers.
   Refresh();
 }
 
 void PersonalDataManager::SetCreditCards(
     std::vector<CreditCard>* credit_cards) {
   if (browser_context_->IsOffTheRecord())
     return;
 
   // Remove empty credit cards from input.
-  credit_cards->erase(
-      std::remove_if(
-          credit_cards->begin(), credit_cards->end(),
-          std::mem_fun_ref(&CreditCard::IsEmpty)),
-      credit_cards->end());
+  for (std::vector<CreditCard>::iterator i = credit_cards->begin();
+       i != credit_cards->end();) {

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

nit: Please use "it" for the iterator name.

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

Done.

+    if (i->IsEmpty(app_locale_)) {
+      credit_cards->erase(i);
+    } else {
+      i++;
+    }

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

nit: No need for curly braces.

+  }
 
   scoped_refptr<AutofillWebDataService> autofill_data(
       AutofillWebDataService::FromBrowserContext(browser_context_));
   if (!autofill_data.get())
     return;
 
   // Any credit cards that are not in the new credit card list should be
   // removed.
   for (std::vector<CreditCard*>::const_iterator iter = credit_cards_.begin();
        iter != credit_cards_.end(); ++iter) {
@@ skipping 117 matching lines @@
     // upon form submission.
     NOTREACHED();
     return;
   }
 
   // Don't save a web profile if the data in the profile is a subset of an
   // auxiliary profile.
   for (std::vector<AutofillProfile*>::const_iterator iter =
            auxiliary_profiles_.begin();
        iter != auxiliary_profiles_.end(); ++iter) {
-    if (imported_profile.IsSubsetOf(**iter))
+    if (imported_profile.IsSubsetOf(**iter, app_locale_))
       return;
   }
 
   std::vector<AutofillProfile> profiles;
-  MergeProfile(imported_profile, web_profiles_.get(), &profiles);
+  MergeProfile(imported_profile, web_profiles_.get(), app_locale_, &profiles);
   SetProfiles(&profiles);
 }
 
 
 void PersonalDataManager::SaveImportedCreditCard(
     const CreditCard& imported_card) {
   DCHECK(!imported_card.number().empty());
   if (browser_context_->IsOffTheRecord()) {
     // The |IsOffTheRecord| check should happen earlier in the import process,
     // upon form submission.
     NOTREACHED();
     return;
   }
 
   // Set to true if |imported_card| is merged into the credit card list.
   bool merged = false;
 
-  const std::string app_locale = AutofillCountry::ApplicationLocale();
   std::vector<CreditCard> credit_cards;
   for (std::vector<CreditCard*>::const_iterator card = credit_cards_.begin();
        card != credit_cards_.end();
        ++card) {
     // If |imported_card| has not yet been merged, check whether it should be
     // with the current |card|.
-    if (!merged && (*card)->UpdateFromImportedCard(imported_card, app_locale))
+    if (!merged && (*card)->UpdateFromImportedCard(imported_card, app_locale_))
       merged = true;
 
     credit_cards.push_back(**card);
   }
 
   if (!merged)
     credit_cards.push_back(imported_card);
 
   SetCreditCards(&credit_cards);
 }
@@ skipping 11 matching lines @@
 
 void PersonalDataManager::set_metric_logger(
     const AutofillMetrics* metric_logger) {
   metric_logger_.reset(metric_logger);
 }
 
 void PersonalDataManager::set_browser_context(
     content::BrowserContext* context) {
   browser_context_ = context;
 }