Remove diacritics when normalizing autofill profile strings for comparison.

components/autofill/core/browser/autofill_manager_unittest.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 "components/autofill/core/browser/autofill_manager.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 3496 matching lines @@
                        "+1 (234) 567-8901");
   profile.set_guid("00000000-0000-0000-0000-000000000001");
   profiles.push_back(profile);
   test::SetProfileInfo(&profile, "Charles", "", "Holley", "buddy@gmail.com",
                        "Decca", "123 Apple St.", "unit 6", "Lubbock", "TX",
                        "79401", "US", "5142821292");
   profile.set_guid("00000000-0000-0000-0000-000000000002");
   profiles.push_back(profile);
   test::SetProfileInfo(&profile, "Charles", "", "Baudelaire",
                        "lesfleursdumal@gmail.com", "", "108 Rue Saint-Lazare",
-                       "Apt. 10", "Paris", "Ile de France", "75008", "FR",
+                       "Apt. 10", "Paris", "Île de France", "75008", "FR",
                        "+33 2 49 19 70 70");
   profile.set_guid("00000000-0000-0000-0000-000000000001");
   profiles.push_back(profile);
 
   // Set up the test credit cards.
   std::vector<CreditCard> credit_cards;
   CreditCard credit_card;
   test::SetCreditCardInfo(&credit_card, "John Doe", "4234-5678-9012-3456", "04",
                           "2999");
   credit_card.set_guid("00000000-0000-0000-0000-000000000003");
@@ skipping 23 matching lines @@
       {"12345678901", PHONE_HOME_WHOLE_NUMBER},
       {"+1 (234) 567-8901", PHONE_HOME_WHOLE_NUMBER},
       {"(234)567-8901", PHONE_HOME_CITY_AND_NUMBER},
       {"2345678901", PHONE_HOME_CITY_AND_NUMBER},
       {"1", PHONE_HOME_COUNTRY_CODE},
       {"234", PHONE_HOME_CITY_CODE},
       {"5678901", PHONE_HOME_NUMBER},
       {"567", PHONE_HOME_NUMBER},
       {"8901", PHONE_HOME_NUMBER},
 
-      // Test an european profile.
+      // Test a European profile.
       {"Paris", ADDRESS_HOME_CITY},
-      {"Ile de France", ADDRESS_HOME_STATE},
+      {"Île de France", ADDRESS_HOME_STATE},  // Exact match
+      {"Ile de France", ADDRESS_HOME_STATE},  // Missing accent.
+      {"-Ile-de-France-", ADDRESS_HOME_STATE},  // Extra punctuation.
+      {"île dÉ FrÃÑÇË", ADDRESS_HOME_STATE},  // Other accents & case mismatch.
       {"75008", ADDRESS_HOME_ZIP},
       {"FR", ADDRESS_HOME_COUNTRY},
       {"France", ADDRESS_HOME_COUNTRY},
       {"33249197070", PHONE_HOME_WHOLE_NUMBER},
       {"+33 2 49 19 70 70", PHONE_HOME_WHOLE_NUMBER},
       {"2 49 19 70 70", PHONE_HOME_CITY_AND_NUMBER},
       {"249197070", PHONE_HOME_CITY_AND_NUMBER},
       {"33", PHONE_HOME_COUNTRY_CODE},
       {"2", PHONE_HOME_CITY_CODE},
 
       // Credit card fields matches.
       {"John Doe", CREDIT_CARD_NAME_FULL},
       {"John", CREDIT_CARD_NAME_FIRST},
       {"Doe", CREDIT_CARD_NAME_LAST},
       {"4234-5678-9012-3456", CREDIT_CARD_NUMBER},
       {"04", CREDIT_CARD_EXP_MONTH},
       {"April", CREDIT_CARD_EXP_MONTH},
       {"2999", CREDIT_CARD_EXP_4_DIGIT_YEAR},
       {"99", CREDIT_CARD_EXP_2_DIGIT_YEAR},
       {"04/2999", CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
 
-      // Make sure whitespaces and invalid characters are handled properly.
+      // Make sure whitespace and invalid characters are handled properly.
       {"", EMPTY_TYPE},
       {" ", EMPTY_TYPE},
       {"***", UNKNOWN_TYPE},
       {" Elvis", NAME_FIRST},
       {"Elvis ", NAME_FIRST},
 
       // Make sure fields that differ by case match.
       {"elvis ", NAME_FIRST},
       {"UnItEd StAtEs", ADDRESS_HOME_COUNTRY},
 
@@ skipping 19 matching lines @@
       {"901", UNKNOWN_TYPE}};
 
   for (TestCase test_case : test_cases) {
     FormData form;
     form.name = ASCIIToUTF16("MyForm");
     form.origin = GURL("http://myform.com/form.html");
     form.action = GURL("http://myform.com/submit.html");
 
     FormFieldData field;
     test::CreateTestFormField("", "1", "", "text", &field);
-    field.value = ASCIIToUTF16(test_case.input_value);
+    field.value = UTF8ToUTF16(test_case.input_value);
     form.fields.push_back(field);
 
     FormStructure form_structure(form);
 
     AutofillManager::DeterminePossibleFieldTypesForUpload(
         profiles, credit_cards, "en-us", &form_structure);
 
     ASSERT_EQ(1U, form_structure.field_count());
     ServerFieldTypeSet possible_types =
         form_structure.field(0)->possible_types();
     EXPECT_EQ(1U, possible_types.size());
 
-    EXPECT_NE(possible_types.end(), possible_types.find(test_case.field_type));
+    EXPECT_NE(possible_types.end(), possible_types.find(test_case.field_type))
+        << "Failed to determine type for: \"" << test_case.input_value << "\"";
   }
 }
 
 // Tests that DeterminePossibleFieldTypesForUpload is called when a form is
 // submitted.
 TEST_F(AutofillManagerTest, DeterminePossibleFieldTypesForUpload_IsTriggered) {
   FormData form;
   form.name = ASCIIToUTF16("MyForm");
   form.origin = GURL("http://myform.com/form.html");
   form.action = GURL("http://myform.com/submit.html");
@@ skipping 1382 matching lines @@
   FormsSeen(mixed_forms);
 
   // Suggestions should always be displayed.
   for (const FormFieldData& field : mixed_form.fields) {
     GetAutofillSuggestions(mixed_form, field);
     EXPECT_TRUE(external_delegate_->on_suggestions_returned_seen());
   }
 }
 
 }  // namespace autofill