Implement a new IDN display policy

components/omnibox/browser/history_url_provider_unittest.cc

Index: components/omnibox/browser/history_url_provider_unittest.cc
diff --git a/components/omnibox/browser/history_url_provider_unittest.cc b/components/omnibox/browser/history_url_provider_unittest.cc
index 8dcb8d66adc9ec40f971bf73f306a4d32294e67a..93c316be986bfd37a4c74dc572f1a579294ab367 100644
--- a/components/omnibox/browser/history_url_provider_unittest.cc
+++ b/components/omnibox/browser/history_url_provider_unittest.cc
@@ -852,8 +852,10 @@ TEST_F(HistoryURLProviderTest, DoesNotProvideMatchesOnFocus) {
 
 TEST_F(HistoryURLProviderTest, DoesNotInlinePunycodeMatches) {
   // A URL that matches due to a match in the punycode URL are allowed to be the
-  // default match if the URL doesn't get rendered as international characters
-  // in the given locale.
+  // default match if the URL doesn't get rendered as international characters.
+  // When the punycode part of the URL is rendered as international characters,
+  // this match should not be allowed to be the default match if the inline
+  // autocomplete text starts in the middle of the international characters.
   const UrlAndLegalDefault expected_true[] = {
     { "http://puny.xn--1lq90ic7f1rc.cn/", true },
   };
@@ -864,28 +866,6 @@ TEST_F(HistoryURLProviderTest, DoesNotInlinePunycodeMatches) {
           arraysize(expected_true));
   RunTest(ASCIIToUTF16("puny."), std::string(), false, expected_true,
           arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny.x"), std::string(), false, expected_true,
-          arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny.xn"), std::string(), false, expected_true,
-          arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny.xn--"), std::string(), false, expected_true,
-          arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny.xn--1l"), std::string(), false, expected_true,
-          arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny.xn--1lq90ic7f1rc"), std::string(), false,
-          expected_true, arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny.xn--1lq90ic7f1rc."), std::string(), false,
-          expected_true, arraysize(expected_true));
-  // Set the language so the punycode part of the URL is rendered as
-  // international characters.  Then this match should not be allowed to be
-  // the default match if the inline autocomplete text starts in the middle
-  // of the international characters.
-  EXPECT_CALL(*client_, GetAcceptLanguages())
-      .WillRepeatedly(testing::Return("zh-CN"));
-  RunTest(ASCIIToUTF16("pun"), std::string(), false, expected_true,
-          arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny."), std::string(), false, expected_true,
-          arraysize(expected_true));
   RunTest(ASCIIToUTF16("puny.x"), std::string(), false, expected_false,
           arraysize(expected_false));
   RunTest(ASCIIToUTF16("puny.xn"), std::string(), false, expected_false,