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..b87f834e6cc8037c52f6081ccdda1f36c9abb0ee 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();
@@ -1165,7 +1165,8 @@ void AutofillDialogControllerImpl::ResetSectionInput(DialogSection section) {
 
   DetailInputs* inputs = MutableRequestedFieldsForSection(section);
   for (DetailInputs::iterator it = inputs->begin(); it != inputs->end(); ++it) {
-    it->initial_value = common::GetHardcodedValueForType(it->type);
+    if (!i18ninput::Enabled())

[Dan Beam, 2014/02/07 01:30:44]

^ remove

[Evan Stade, 2014/02/08 02:30:13]

Done.

+      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)