Add country combobox to change country and rebuild address inputs.

chrome/browser/ui/autofill/autofill_dialog_i18n_input_unittest.cc

 // Copyright 2014 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_i18n_input.h"
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
 namespace i18ninput {
 
 namespace {
 
 const size_t kNumberOfAddressLinesUS = 7;
 
-void AppendSwitch() {
+}  // namespace
+
+TEST(AutofillDialogI18nInput, DisabledByDefaultEnabledByFlag) {
+  EXPECT_FALSE(Enabled());
+
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   command_line->AppendSwitch(::switches::kEnableAutofillAddressI18n);
-  ASSERT_TRUE(Enabled());
-}
 
-}  // namespace
-
-TEST(AutofillDialogI18nInput, DisabledByDefault) {
-  EXPECT_FALSE(Enabled());
+  EXPECT_TRUE(Enabled());
 }
 
 TEST(AutofillDialogI18nInput, USShippingAddress) {
-  AppendSwitch();
-
   DetailInputs inputs;
   BuildAddressInputs(common::ADDRESS_TYPE_SHIPPING, "US", &inputs);
 
   ASSERT_EQ(kNumberOfAddressLinesUS, inputs.size());
   EXPECT_EQ(NAME_FULL, inputs[0].type);
   EXPECT_EQ(ADDRESS_HOME_COUNTRY, inputs[kNumberOfAddressLinesUS - 1].type);
 }
 
 TEST(AutofillDialogI18nInput, USBillingAddress) {
-  AppendSwitch();
-
   DetailInputs inputs;
   BuildAddressInputs(common::ADDRESS_TYPE_BILLING, "US", &inputs);
 
   ASSERT_EQ(kNumberOfAddressLinesUS, inputs.size());
   EXPECT_EQ(NAME_BILLING_FULL, inputs[0].type);
   EXPECT_EQ(ADDRESS_BILLING_COUNTRY, inputs[kNumberOfAddressLinesUS - 1].type);
 }
 
 TEST(AutofillDialogI18nInput, USCityStateAndZipCodeShareInputRow) {
-  AppendSwitch();
-
   DetailInputs inputs;
   BuildAddressInputs(common::ADDRESS_TYPE_SHIPPING, "US", &inputs);
   ASSERT_EQ(kNumberOfAddressLinesUS, inputs.size());
 
   // Inputs before or after [ City ] [ State ] [ Zip ] should be on other lines.
   EXPECT_NE(inputs[2].length, DetailInput::SHORT);
 
   const DetailInput& city = inputs[3];
   ASSERT_EQ(ADDRESS_HOME_CITY, city.type);
   EXPECT_EQ(city.length, DetailInput::SHORT);
 
   const DetailInput& state = inputs[4];
   ASSERT_EQ(ADDRESS_HOME_STATE, state.type);
   EXPECT_EQ(state.length, DetailInput::SHORT);
 
   const DetailInput& zip = inputs[5];
   ASSERT_EQ(ADDRESS_HOME_ZIP, zip.type);
   EXPECT_EQ(zip.length, DetailInput::SHORT);
 
   EXPECT_NE(inputs[6].length, DetailInput::SHORT);
 }
 
 }  // namespace i18ninput
 }  // namespace autofill