Add country combobox to change country and rebuild address inputs.

chrome/browser/ui/autofill/autofill_dialog_common.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_common.h"
 
 #include "chrome/browser/browser_process.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_type.h"
@@ skipping 246 matching lines @@
 
     case SECTION_CC:
       return AutofillMetrics::DIALOG_UI_CC_SELECTED_SUGGESTION_CHANGED;
   }
 
   NOTREACHED();
   return AutofillMetrics::NUM_DIALOG_UI_EVENTS;
 }
 
 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();
   }
 
   return base::string16();
 }
 
 }  // namespace common
 }  // namespace autofill