autocomplete: support address-line3, address-level{1,2,3}

chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

 // Copyright (c) 2012 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 <map>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 75 matching lines @@
 const char kEditedBillingAddress[] = "123 edited billing address";
 const char* kFieldsFromPage[] =
     { "email",
       "cc-name",
       "cc-number",
       "cc-exp-month",
       "cc-exp-year",
       "cc-csc",
       "billing name",
       "billing address-line1",
-      "billing locality",
-      "billing region",
+      "billing address-level2",
+      "billing address-level1",
       "billing postal-code",
       "billing country",
       "billing tel",
       "shipping name",
       "shipping address-line1",
-      "shipping locality",
-      "shipping region",
+      "shipping address-level2",
+      "shipping address-level1",
       "shipping postal-code",
       "shipping country",
       "shipping tel",
     };
 const char kSettingsOrigin[] = "Chrome settings";
 const char kTestCCNumberAmex[] = "376200000000002";
 const char kTestCCNumberVisa[] = "4111111111111111";
 const char kTestCCNumberMaster[] = "5555555555554444";
 const char kTestCCNumberDiscover[] = "6011111111111117";
 const char kTestCCNumberIncomplete[] = "4111111111";
@@ skipping 2294 matching lines @@
   EXPECT_EQ(
       2, controller()->MenuModelForSection(SECTION_SHIPPING)->GetItemCount());
 }
 
 TEST_F(AutofillDialogControllerTest, ShippingSectionCanBeHidden) {
   FormFieldData email_field;
   email_field.autocomplete_attribute = "email";
   FormFieldData cc_field;
   cc_field.autocomplete_attribute = "cc-number";
   FormFieldData billing_field;
-  billing_field.autocomplete_attribute = "billing region";
+  billing_field.autocomplete_attribute = "billing address-level1";
 
   FormData form_data;
   form_data.fields.push_back(email_field);
   form_data.fields.push_back(cc_field);
   form_data.fields.push_back(billing_field);
 
   AutofillProfile full_profile(test::GetVerifiedProfile());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
   SetUpControllerWithFormData(form_data);
 
   SwitchToAutofill();
 
   EXPECT_FALSE(controller()->SectionIsActive(SECTION_SHIPPING));
 
   FillCreditCardInputs();
   controller()->OnAccept();
   EXPECT_TRUE(form_structure());
 }
 
 TEST_F(AutofillDialogControllerTest, ShippingSectionCanBeHiddenForWallet) {
   FormFieldData email_field;
   email_field.autocomplete_attribute = "email";
   FormFieldData cc_field;
   cc_field.autocomplete_attribute = "cc-number";
   FormFieldData billing_field;
-  billing_field.autocomplete_attribute = "billing region";
+  billing_field.autocomplete_attribute = "billing address-level1";
 
   FormData form_data;
   form_data.fields.push_back(email_field);
   form_data.fields.push_back(cc_field);
   form_data.fields.push_back(billing_field);
 
   SetUpControllerWithFormData(form_data);
   EXPECT_FALSE(controller()->SectionIsActive(SECTION_SHIPPING));
   EXPECT_FALSE(controller()->IsShippingAddressRequired());
 
@@ skipping 688 matching lines @@
   };
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   for (size_t i = 0; i < arraysize(kSupportedCardIdrs); ++i) {
     SCOPED_TRACE(base::IntToString(i));
     gfx::Image supported_card_icon = rb.GetImageNamed(kSupportedCardIdrs[i]);
     EXPECT_GE(placeholder_icon.Width(), supported_card_icon.Width());
     EXPECT_GE(placeholder_icon.Height(), supported_card_icon.Height());
   }
 }
 
-TEST_F(AutofillDialogControllerTest, NoPartiallySupportedCountriesSuggested) {
-  SwitchToAutofill();
-
-  std::string partially_supported_country = "KR";
-  ASSERT_FALSE(i18ninput::CountryIsFullySupported(partially_supported_country));
-  ASSERT_FALSE(controller()->MenuModelForSection(SECTION_BILLING));
-
-  AutofillProfile verified_profile(test::GetVerifiedProfile());
-  verified_profile.SetRawInfo(ADDRESS_HOME_COUNTRY,
-                              ASCIIToUTF16(partially_supported_country));
-  controller()->GetTestingManager()->AddTestingProfile(&verified_profile);
-
-  EXPECT_FALSE(
-      controller()->SuggestionStateForSection(SECTION_BILLING).visible);
-}
-
 TEST_F(AutofillDialogControllerTest, CountryChangeUpdatesSection) {
   TestAutofillDialogView* view = controller()->GetView();
   view->ClearSectionUpdates();
 
   controller()->UserEditedOrActivatedInput(SECTION_SHIPPING,
                                            ADDRESS_HOME_COUNTRY,
                                            gfx::NativeView(),
                                            gfx::Rect(),
                                            ASCIIToUTF16("Belarus"),
                                            true);
@@ skipping 264 matching lines @@
   form_data.fields[0] = field;
 
   // Add MC to FormData; Wallet is enabled.
   SetUpControllerWithFormData(form_data);
   EXPECT_TRUE(controller()->IsPayingWithWallet());
   // Even though Discover isn't in FormData, it's allowed because Wallet always
   // generates a MC Virtual card.
   ValidateCCNumber(SECTION_CC_BILLING, kTestCCNumberDiscover, true);
 }
 
-TEST_F(AutofillDialogControllerTest, CountriesWithDependentLocalityHidden) {
-  ui::ComboboxModel* model =
-      controller()->ComboboxModelForAutofillType(ADDRESS_BILLING_COUNTRY);
-  for (int i = 0; i < model->GetItemCount(); ++i) {
-    EXPECT_NE(base::ASCIIToUTF16("China"), model->GetItemAt(i));
-    EXPECT_NE(base::ASCIIToUTF16("South Korea"), model->GetItemAt(i));
-  }
-
-  model = controller()->ComboboxModelForAutofillType(ADDRESS_HOME_COUNTRY);
-  for (int i = 0; i < model->GetItemCount(); ++i) {
-    EXPECT_NE(base::ASCIIToUTF16("China"), model->GetItemAt(i));
-    EXPECT_NE(base::ASCIIToUTF16("South Korea"), model->GetItemAt(i));
-  }
-}
-
-TEST_F(AutofillDialogControllerTest, DontSuggestHiddenCountries) {
-  SwitchToAutofill();
-
-  FieldValueMap outputs;
-  outputs[ADDRESS_HOME_COUNTRY] = ASCIIToUTF16("US");
-  controller()->GetView()->SetUserInput(SECTION_SHIPPING, outputs);
-
-  AutofillProfile cn_profile(test::GetVerifiedProfile());
-  cn_profile.SetRawInfo(NAME_FULL, ASCIIToUTF16("Chinese User"));
-  cn_profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("CN"));
-  controller()->GetTestingManager()->AddTestingProfile(&cn_profile);
-
-  controller()->UserEditedOrActivatedInput(
-      SECTION_SHIPPING,
-      NAME_FULL,
-      gfx::NativeView(),
-      gfx::Rect(),
-      cn_profile.GetRawInfo(NAME_FULL).substr(0, 1),
-      true);
-  EXPECT_EQ(UNKNOWN_TYPE, controller()->popup_input_type());
-
-  AutofillProfile us_profile(test::GetVerifiedProfile());
-  us_profile.SetRawInfo(NAME_FULL, ASCIIToUTF16("American User"));
-  ASSERT_NE(cn_profile.GetRawInfo(NAME_FULL)[0],
-            us_profile.GetRawInfo(NAME_FULL)[0]);
-  controller()->GetTestingManager()->AddTestingProfile(&us_profile);
-
-  controller()->UserEditedOrActivatedInput(
-      SECTION_SHIPPING,
-      NAME_FULL,
-      gfx::NativeView(),
-      gfx::Rect(),
-      us_profile.GetRawInfo(NAME_FULL).substr(0, 1),
-      true);
-  EXPECT_EQ(NAME_FULL, controller()->popup_input_type());
-}
-
 TEST_F(AutofillDialogControllerTest, SuggestCountrylessProfiles) {
   SwitchToAutofill();
 
   FieldValueMap outputs;
   outputs[ADDRESS_HOME_COUNTRY] = ASCIIToUTF16("US");
   controller()->GetView()->SetUserInput(SECTION_SHIPPING, outputs);
 
   AutofillProfile profile(test::GetVerifiedProfile());
   profile.SetRawInfo(NAME_FULL, ASCIIToUTF16("The Man Without a Country"));
   profile.SetRawInfo(ADDRESS_HOME_COUNTRY, base::string16());
@@ skipping 51 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("United States"), form_structure()->field(2)->value);
   EXPECT_EQ(ADDRESS_HOME_COUNTRY,
             form_structure()->field(3)->Type().GetStorableType());
   EXPECT_EQ(ASCIIToUTF16("US"), form_structure()->field(3)->value);
   EXPECT_EQ(ADDRESS_HOME_COUNTRY,
             form_structure()->field(4)->Type().GetStorableType());
   EXPECT_EQ(ASCIIToUTF16("United States"), form_structure()->field(4)->value);
 }
 
 }  // namespace autofill