Add country combobox to change country and rebuild address inputs.

chrome/browser/ui/autofill/autofill_dialog_i18n_input_unittest.cc

Index: chrome/browser/ui/autofill/autofill_dialog_i18n_input_unittest.cc
diff --git a/chrome/browser/ui/autofill/autofill_dialog_i18n_input_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_i18n_input_unittest.cc
index 99380c8bcb4f33edece1a93f7e6db038acb250bd..3b3b50714a810b2374ac78e636287f8f7dfc5d9d 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_i18n_input_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_i18n_input_unittest.cc
@@ -16,21 +16,18 @@ namespace {
 
 const size_t kNumberOfAddressLinesUS = 7;
 
-void AppendSwitch() {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  command_line->AppendSwitch(::switches::kEnableAutofillAddressI18n);
-  ASSERT_TRUE(Enabled());
-}
-
 }  // namespace
 
-TEST(AutofillDialogI18nInput, DisabledByDefault) {
+TEST(AutofillDialogI18nInput, DisabledByDefaultEnabledByFlag) {
   EXPECT_FALSE(Enabled());
+
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  command_line->AppendSwitch(::switches::kEnableAutofillAddressI18n);
+
+  EXPECT_TRUE(Enabled());
 }
 
 TEST(AutofillDialogI18nInput, USShippingAddress) {
-  AppendSwitch();
-
   DetailInputs inputs;
   BuildAddressInputs(common::ADDRESS_TYPE_SHIPPING, "US", &inputs);
 
@@ -40,8 +37,6 @@ TEST(AutofillDialogI18nInput, USShippingAddress) {
 }
 
 TEST(AutofillDialogI18nInput, USBillingAddress) {
-  AppendSwitch();
-
   DetailInputs inputs;
   BuildAddressInputs(common::ADDRESS_TYPE_BILLING, "US", &inputs);
 
@@ -51,8 +46,6 @@ TEST(AutofillDialogI18nInput, USBillingAddress) {
 }
 
 TEST(AutofillDialogI18nInput, USCityStateAndZipCodeShareInputRow) {
-  AppendSwitch();
-
   DetailInputs inputs;
   BuildAddressInputs(common::ADDRESS_TYPE_SHIPPING, "US", &inputs);
   ASSERT_EQ(kNumberOfAddressLinesUS, inputs.size());