rAc - hardcode wallet billing address to US in i18n mode

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

Index: chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
index 4dd16a90df03a086b388050893dde8df916cc49d..29105863b83bbfa4331a207c8cdc5618fddf86b9 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
@@ -660,7 +660,7 @@ void AutofillDialogControllerImpl::Show() {
   for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
     DialogSection section = static_cast<DialogSection>(i);
 
-    std::string country_code;
+    std::string country_code = "US";
     CountryComboboxModel* model = CountryComboboxModelForSection(section);
     if (model)
       country_code = model->GetDefaultCountryCode();
@@ -1161,11 +1161,12 @@ void AutofillDialogControllerImpl::ResetSectionInput(DialogSection section) {
       base::string16 country = model->GetItemAt(model->GetDefaultIndex());
       RebuildInputsForCountry(section, country, false);
     }
-  }
-
-  DetailInputs* inputs = MutableRequestedFieldsForSection(section);
-  for (DetailInputs::iterator it = inputs->begin(); it != inputs->end(); ++it) {
-    it->initial_value = common::GetHardcodedValueForType(it->type);
+  } else {
+    DetailInputs* inputs = MutableRequestedFieldsForSection(section);
+    for (DetailInputs::iterator it = inputs->begin();
+         it != inputs->end(); ++it) {
+      it->initial_value = common::GetHardcodedValueForType(it->type);
+    }
   }
 }
 
@@ -3174,7 +3175,7 @@ DialogSection AutofillDialogControllerImpl::SectionForSuggestionsMenuModel(
 
 CountryComboboxModel* AutofillDialogControllerImpl::
     CountryComboboxModelForSection(DialogSection section) {
-  if (section == SECTION_BILLING || section == SECTION_CC_BILLING)
+  if (section == SECTION_BILLING)
     return &billing_country_combobox_model_;
 
   if (section == SECTION_SHIPPING)