CountryNames: Separate data creation from usage

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 <map>
 #include <string>
 #include <utility>
@@ skipping 12 matching lines @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/autofill/risk_util.h"
 #include "chrome/browser/autofill/validation_rules_storage_factory.h"
 #include "chrome/browser/browser_process.h"

[Ilya Sherman, 2016/01/21 02:07:56]

nit: Can this include be removed from this, or any other, files?

[vabr (Chromium), 2016/01/22 17:36:41]

It is still used by FormGroups (see, e.g., line 192). I tried to check this in
the other affected files as well, and did not find an instance where I could
remove the #include.

 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_common.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_i18n_input.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
 #include "chrome/browser/ui/autofill/new_credit_card_bubble_controller.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_navigator_params.h"
@@ skipping 110 matching lines @@
   ServerFieldType field_type = type.GetStorableType();
   if (section != SECTION_SHIPPING)
     field_type = AutofillType::GetEquivalentBillingFieldType(field_type);
 
   base::string16 info;
   FieldValueMap::const_iterator it = inputs.find(field_type);
   if (it != inputs.end())
     info = it->second;
 
   if (!info.empty() && type.html_type() == HTML_TYPE_COUNTRY_CODE) {
-    info = base::ASCIIToUTF16(CountryNames::GetInstance()->GetCountryCode(
-        info, g_browser_process->GetApplicationLocale()));
+    info =
+        base::ASCIIToUTF16(CountryNames::GetInstance()->GetCountryCode(info));
   }
 
   return info;
 }
 
 // Returns true if |input| should be used to fill a site-requested |field| which
 // is notated with a "shipping" tag, for use when the user has decided to use
 // the billing address as the shipping address.
 bool ServerTypeMatchesShippingField(ServerFieldType type,
                                     const AutofillField& field) {
@@ skipping 58 matching lines @@
   return rb.GetImageNamed(IDR_CREDIT_CARD_CVC_HINT);
 }
 
 ServerFieldType CountryTypeForSection(DialogSection section) {
   return section == SECTION_SHIPPING ? ADDRESS_HOME_COUNTRY :
                                        ADDRESS_BILLING_COUNTRY;
 }
 
 ValidityMessage GetPhoneValidityMessage(const base::string16& country_name,
                                         const base::string16& number) {
-  std::string region = CountryNames::GetInstance()->GetCountryCode(
-      country_name, g_browser_process->GetApplicationLocale());
+  std::string region =
+      CountryNames::GetInstance()->GetCountryCode(country_name);
   i18n::PhoneObject phone_object(number, region);
   ValidityMessage phone_message(base::string16(), true);
 
   // Check if the phone number is invalid. Allow valid international
   // numbers that don't match the address's country only if they have an
   // international calling code.
   if (!phone_object.IsValidNumber() ||
       (phone_object.country_code().empty() &&
        phone_object.region() != region)) {
     phone_message.text = l10n_util::GetStringUTF16(
@@ skipping 364 matching lines @@
   }
 
   DetailInputs* inputs = MutableRequestedFieldsForSection(section);
   for (DetailInputs::iterator it = inputs->begin();
        it != inputs->end(); ++it) {
     if (it->length != DetailInput::NONE) {
       it->initial_value.clear();
     } else if (!it->initial_value.empty() &&
                (it->type == ADDRESS_BILLING_COUNTRY ||
                 it->type == ADDRESS_HOME_COUNTRY)) {
-      GetValidator()->LoadRules(CountryNames::GetInstance()->GetCountryCode(
-          it->initial_value, g_browser_process->GetApplicationLocale()));
+      GetValidator()->LoadRules(
+          CountryNames::GetInstance()->GetCountryCode(it->initial_value));
     }
   }
 }
 
 void AutofillDialogControllerImpl::ShowEditUiIfBadSuggestion(
     DialogSection section) {
   // |CreateWrapper()| returns an empty wrapper if |IsEditingExistingData()|, so
   // get the wrapper before this potentially happens below.
   scoped_ptr<DataModelWrapper> wrapper = CreateWrapper(section);
 
@@ skipping 1269 matching lines @@
 
   scoped_ptr<DataModelWrapper> wrapper = CreateWrapper(section);
   if (wrapper) {
     country = wrapper->GetInfo(AutofillType(CountryTypeForSection(section)));
   } else {
     FieldValueMap outputs;
     view_->GetUserInput(section, &outputs);
     country = outputs[CountryTypeForSection(section)];
   }
 
-  return CountryNames::GetInstance()->GetCountryCode(
-      country, g_browser_process->GetApplicationLocale());
+  return CountryNames::GetInstance()->GetCountryCode(country);
 }
 
 bool AutofillDialogControllerImpl::RebuildInputsForCountry(
     DialogSection section,
     const base::string16& country_name,
     bool should_clobber) {
   CountryComboboxModel* model = CountryComboboxModelForSection(section);
   if (!model)
     return false;
 
-  std::string country_code = CountryNames::GetInstance()->GetCountryCode(
-      country_name, g_browser_process->GetApplicationLocale());
+  std::string country_code =
+      CountryNames::GetInstance()->GetCountryCode(country_name);
   DCHECK(CanAcceptCountry(section, country_code));
 
   if (view_ && !should_clobber) {
     FieldValueMap outputs;
     view_->GetUserInput(section, &outputs);
 
     // If |country_name| is the same as the view, no-op and let the caller know.
     if (outputs[CountryTypeForSection(section)] == country_name)
       return false;
   }
 
   DetailInputs* inputs = MutableRequestedFieldsForSection(section);
   inputs->clear();
   BuildInputsForSection(section, country_code, inputs,
                         MutableAddressLanguageCodeForSection(section));
 
   if (!country_code.empty()) {
-    GetValidator()->LoadRules(CountryNames::GetInstance()->GetCountryCode(
-        country_name, g_browser_process->GetApplicationLocale()));
+    GetValidator()->LoadRules(
+        CountryNames::GetInstance()->GetCountryCode(country_name));
   }
 
   return true;
 }
 
 void AutofillDialogControllerImpl::HidePopup() {
   if (popup_controller_)
     popup_controller_->Hide();
   popup_input_type_ = UNKNOWN_TYPE;
 }
@@ skipping 345 matching lines @@
 }
 
 void AutofillDialogControllerImpl::OnSubmitButtonDelayEnd() {
   if (!view_)
     return;
   ScopedViewUpdates updates(view_.get());
   view_->UpdateButtonStrip();
 }
 
 }  // namespace autofill