Added ARMENIAN SMALL LETTER SHA (U+0577), ARMENIAN SMALL LETTER CHEH (U+0573),...

Added ARMENIAN SMALL LETTER SHA (U+0577), ARMENIAN SMALL LETTER CHEH (U+0573), BOPOMOFO LETTER J (U+3110) to confusable mapping

Bug: 896453
Change-Id: I45b0b2dff9eeb0faeff5f8a10ce4829440124ad6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1740614
Commit-Queue: Sean Kelker <seankelker@google.com>
Reviewed-by: Mustafa Emre Acer <meacer@chromium.org>
Reviewed-by: Livvie Lin <livvielin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686132}

components/url_formatter/spoof_checks/idn_spoof_checker.cc

@@ -214,11 +214,12 @@ IDNSpoofChecker::IDNSpoofChecker() {
   //   - {U+0E1A (บ), U+0E9A (ບ)} => u,
   //   - {U+03B8 (θ)} => 0,
   //   - {U+0968 (२), U+09E8 (২), U+0A68 (੨), U+0A68 (੨), U+0AE8 (૨),
-  //      U+0ce9 (೩), U+0ced (೭)} => 2,
+  //      U+0ce9 (೩), U+0ced (೭), U+0577 (շ)} => 2,
   //   - {U+0437 (з), U+0499 (ҙ), U+04E1 (ӡ), U+0909 (उ), U+0993 (ও),
   //      U+0A24 (ਤ), U+0A69 (੩), U+0AE9 (૩), U+0C69 (౩),
   //      U+1012 (ဒ), U+10D5 (ვ), U+10DE (პ)} => 3
-  //   - {U+0A6B (੫), U+4E29 (丩)} => 4,
+  //   - {U+0A6B (੫), U+4E29 (丩), U+3110 (ㄐ)} => 4,
+  //   - U+0573 (ճ) => 6
   //   - {U+09EA (৪), U+0A6A (੪), U+0b6b (୫)} => 8,
   //   - {U+0AED (૭), U+0b68 (୨), U+0C68 (౨)} => 9,
   //   Map a few dashes that ICU doesn't map. These are already blocked by ICU,
@@ -237,9 +238,10 @@ IDNSpoofChecker::IDNSpoofChecker() {
           "[৭੧૧] > q;"
           "[บບ] > u;"
           "[θ] > 0;"
-          "[२২੨੨૨೩೭] > 2;"
+          "[२২੨੨૨೩೭շ] > 2;"
           "[зҙӡउওਤ੩૩౩ဒვპ] > 3;"
-          "[੫丩] > 4;"
+          "[੫丩ㄐ] > 4;"
+          "[ճ] > 6;"
           "[৪੪୫] > 8;"
           "[૭୨౨] > 9;"
           "[—一―⸺⸻] > \\-;"),

components/url_formatter/spoof_checks/idn_spoof_checker_unittest.cc

@@ -563,6 +563,10 @@ const IDNTestCase kIdnCases[] = {
     // ӏԍԃ.com
     {"xn--s5a8h3a.com", L"\x04cf\x050d\x0503.com", false},
 
+    // 1շ34567890.com
+    {"xn--134567890-gnk.com",
+     L"1շ34567890.com",
+     false},
     // ꓲ2345б7890.com
     {"xn--23457890-e7g93622b.com",
      L"\xa4f2"
@@ -620,6 +624,10 @@ const IDNTestCase kIdnCases[] = {
      L"12\x10DE"
      L"4567890.com",
      false},
+    // 123ㄐ567890.com
+    {"xn--123567890-dr5h.com",
+     L"123ㄐ567890.com",
+     false},
     // 123Ꮞ567890.com
     {"xn--123567890-dm4b.com",
      L"123\x13ce"
@@ -630,6 +638,10 @@ const IDNTestCase kIdnCases[] = {
      L"12345\x0431"
      L"7890.com",
      false},
+    // 12345ճ7890.com
+    {"xn--123457890-fmk.com",
+     L"12345ճ7890.com",
+     false},
     // 1234567ȣ90.com
     {"xn--123456790-6od.com",
      L"1234567\x0223"