Drop Mongolian from the IDN script list and tighten up the policy on Armenian-Latin mixing

components/url_formatter/url_formatter_unittest.cc

Index: components/url_formatter/url_formatter_unittest.cc
diff --git a/components/url_formatter/url_formatter_unittest.cc b/components/url_formatter/url_formatter_unittest.cc
index efd3a3974284746b9c474daba466d488a2a1da96..1bbba49e1f78bfad13bf8c6fc967263549e59c2c 100644
--- a/components/url_formatter/url_formatter_unittest.cc
+++ b/components/url_formatter/url_formatter_unittest.cc
@@ -121,7 +121,7 @@ const IDNTestCase idn_cases[] = {
   {"xn---123-kbjl2j0bl2k.in",
     L"\x0939\x093f\x0928\x094d\x0926\x0940-123.in", true},
 
-  // 5 Aspirational scripts
+  // 4 Aspirational scripts
   // Unifieid Canadian Syllabary
   {"xn--dfe0tte.ca", L"\x1456\x14c2\x14ef.ca", true},
   // Tifinagh
@@ -131,12 +131,14 @@ const IDNTestCase idn_cases[] = {
   {"xn--hmjzaby5d5f.ma", L"\x2d5c\x2d49\x2d3c\x2d6f\x2d49\x2d4f.ma", false},
   // Yi
   {"xn--4o7a6e1x64c.cn", L"\xa188\xa320\xa071\xa0b7.cn", true},
+  // Miao/Pollad
+  {"xn--2u0fpf0a.cn", L"\U00016f04\U00016f62\U00016f59.cn", true},
+
+  // Mongolian is disallowed because it's written vertically.
   // Mongolian - 'ordu' (place, camp)
-  {"xn--56ec8bp.cn", L"\x1823\x1837\x1833\x1824.cn", true},
+  {"xn--56ec8bp.cn", L"\x1823\x1837\x1833\x1824.cn", false},
   // Mongolian with a disallowed character
   {"xn--95e5de3ds.cn", L"\x1823\x1837\x1804\x1833\x1824.cn", false},
-  // Miao/Pollad
-  {"xn--2u0fpf0a.cn", L"\U00016f04\U00016f62\U00016f59.cn", true},
 
   // Script mixing tests
   // The following script combinations are allowed.
@@ -209,6 +211,11 @@ const IDNTestCase idn_cases[] = {
   {"xn--rol-ho4a.com", L"rol\u24df.com", false},
   {"xn--ily-eo4a.com", L"\u24dfily.com", false},
   {"xn--1ly-eo4a.com", L"\u24df1ly.com", false},
+  // Miao + Latin
+  {"xn--liy-rc12a.com", L"li\U00016FD8y.com", false},
+  {"xn--rol-sc12a.com", L"roll\U00016FD8.com", false},
+  {"xn--ily-pc12a.com", L"\U00016FD8ily.com", false},
+  {"xn--1ly-pc12a.com", L"\U00016FD81ly.com", false},
 
   // Invisibility check
   // Thai tone mark malek(U+0E48) repeated
@@ -221,13 +228,19 @@ const IDNTestCase idn_cases[] = {
   {"xn--abc-fdc.jp", L"\x0300" L"abc.jp", false},
 
   // Mixed script confusable
-  // google with Armenian Small Letter Oh(U+0585)
+  // Armenian օ, ո, հ, and զ mixed with Latin
   {"xn--gogle-lkg.com", L"g\x0585ogle.com", false},
   {"xn--range-kkg.com", L"\x0585range.com", false},
   {"xn--cucko-pkg.com", L"cucko\x0585.com", false},
-  // Latin 'o' in Armenian.
+  {"xn--an-bed.com", L"\x0578" L"an.com", false},
+  {"xn--hig-tee.com", L"hig\x0570.com", false},
+  {"xn---ray-fef.com", L"\x0566-ray.com", false},
+  // Latin 'o', 'h' and 'n' in Armenian
   {"xn--o-ybcg0cu0cq.com",
     L"o\x0585\x0580\x0574\x0578\x0582\x0566\x0568.com", false},
+  {"xn--h-qccm4a.com", L"\x0580\x0574\x0578h.com", false},
+  {"xn--n-rccm3a.com", L"\x0580n\x0574\x0578.com", false},
+  {"xn--n1-0ddq0b.com", L"\x0580n1\x0574\x0578.com", false},
   // Hiragana HE(U+3078) mixed with Katakana
   {"xn--49jxi3as0d0fpc.com",
     L"\x30e2\x30d2\x30fc\x30c8\x3078\x30d6\x30f3.com", false},