Remove some more bad ASCII-centric autofill code.

components/autofill/core/browser/contact_info_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/contact_info.h"
 
 #include "base/basictypes.h"
 #include "base/format_macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
+using base::UTF8ToUTF16;
 
 namespace autofill {
 
 struct FullNameTestCase {
   std::string full_name_input;
   std::string given_name_output;
   std::string middle_name_output;
   std::string family_name_output;
 } full_name_test_cases[] = {
   { "", "", "", "" },
@@ skipping 182 matching lines @@
       {{"Marion", "Mitchell", "Morrison"},
        {"Marion Mitchell", "", "MORRISON"},
        false},
 
       // Different names.
       {{"Marion", "Mitchell", "Morrison"}, {"Marion", "M.", "Morrison"}, false},
       {{"Marion", "Mitchell", "Morrison"}, {"MARION", "M.", "MORRISON"}, false},
       {{"Marion", "Mitchell", "Morrison"},
        {"David", "Mitchell", "Morrison"},
        false},
+
+      // Non-ASCII characters.
+      {{"M\xc3\xa1rion Mitchell", "", "Morrison"},
+       {"M\xc3\x81RION MITCHELL", "", "MORRISON"},
+       true},
   };
 
   for (size_t i = 0; i < arraysize(test_cases); ++i) {
     SCOPED_TRACE(base::StringPrintf("i: %" PRIuS, i));
 
     // Construct the starting_profile.
     NameInfo starting_profile;
     starting_profile.SetRawInfo(NAME_FIRST,
-                                ASCIIToUTF16(test_cases[i].starting_names[0]));
+                                UTF8ToUTF16(test_cases[i].starting_names[0]));
     starting_profile.SetRawInfo(NAME_MIDDLE,
-                                ASCIIToUTF16(test_cases[i].starting_names[1]));
+                                UTF8ToUTF16(test_cases[i].starting_names[1]));
     starting_profile.SetRawInfo(NAME_LAST,
-                                ASCIIToUTF16(test_cases[i].starting_names[2]));
+                                UTF8ToUTF16(test_cases[i].starting_names[2]));
 
     // Construct the additional_profile.
     NameInfo additional_profile;
     additional_profile.SetRawInfo(
-        NAME_FIRST, ASCIIToUTF16(test_cases[i].additional_names[0]));
+        NAME_FIRST, UTF8ToUTF16(test_cases[i].additional_names[0]));
     additional_profile.SetRawInfo(
-        NAME_MIDDLE, ASCIIToUTF16(test_cases[i].additional_names[1]));
+        NAME_MIDDLE, UTF8ToUTF16(test_cases[i].additional_names[1]));
     additional_profile.SetRawInfo(
-        NAME_LAST, ASCIIToUTF16(test_cases[i].additional_names[2]));
+        NAME_LAST, UTF8ToUTF16(test_cases[i].additional_names[2]));
 
     // Verify the test expectations.
     EXPECT_EQ(test_cases[i].expected_result,
               starting_profile.ParsedNamesAreEqual(additional_profile));
   }
 }
 
 }  // namespace autofill