Add country combobox to change country and rebuild address inputs.

chrome/browser/ui/autofill/autofill_dialog_common.cc

Index: chrome/browser/ui/autofill/autofill_dialog_common.cc
diff --git a/chrome/browser/ui/autofill/autofill_dialog_common.cc b/chrome/browser/ui/autofill/autofill_dialog_common.cc
index 7c4db15825a5b791d868e86f72c9a42cf7f502f5..5c3fdac846ce9e8b9d099b5a5dbb5d6eeddffd8d 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_common.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_common.cc
@@ -264,6 +264,10 @@ AutofillMetrics::DialogUiEvent DialogSectionToUiSelectionChangedEvent(
 }
 
 base::string16 GetHardcodedValueForType(ServerFieldType type) {
+  // TODO(dbeam): remove this entire function when i18n inputs are the default.
+  if (IsI18nInputEnabled())
+    return base::string16();
+
   if (AutofillType(type).GetStorableType() == ADDRESS_HOME_COUNTRY) {
     AutofillCountry country("US", g_browser_process->GetApplicationLocale());
     return country.name();