[Autofill] Fixed wrong simplified Chinese language code.

Simplified and traditional Chinese are represented by zh-CN and zh-TW,
respectively, by Translate's language detection. This CL replaces
"zh" with the "zh-CN" or "zh-TW", respectively.

Bug: 1142413
Change-Id: Id19c3fa0f081a91ca35ec775f3a6d3567e78dcc5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2584809
Commit-Queue: Christoph Schwering <schwering@google.com>
Reviewed-by: Matthias Körber <koerber@google.com>
Cr-Commit-Position: refs/heads/master@{#837063}

components/autofill/core/browser/pattern_provider/resources/regex_patterns.json

@@ -292,7 +292,7 @@
         "match_field_input_types": 1
       }
     ],
-    "zh": [
+    "zh-CN": [
       {
         "pattern_identifier": "zh_company_preserving",
         "positive_pattern": "单位|公司",
@@ -436,7 +436,7 @@
         "match_field_input_types": 1
       }
     ],
-    "zh": [
+    "zh-CN": [
       {
         "pattern_identifier": "zh_address_line_1_preserving",
         "positive_pattern": "地址",
@@ -444,14 +444,6 @@
         "negative_pattern": null,
         "match_field_attributes": 3,
         "match_field_input_types": 1
-      },
-      {
-        "pattern_identifier": "zh_address_line_1_label_preserving",
-        "positive_pattern": "地址",
-        "positive_score": 1.1,
-        "negative_pattern": null,
-        "match_field_attributes": 1,
-        "match_field_input_types": 1
       }
     ],
     "tr": [
@@ -597,7 +589,7 @@
         "match_field_input_types": 1
       }
     ],
-    "zh": [
+    "zh-CN": [
       {
         "pattern_identifier": "zh_address_line_2_preserving",
         "positive_pattern": "地址2",
@@ -729,7 +721,7 @@
         "match_field_input_types": 137
       }
     ],
-    "zh": [
+    "zh-CN": [
       {
         "pattern_identifier": "zh_country_preserving",
         "positive_pattern": "国家",
@@ -883,10 +875,20 @@
         "match_field_input_types": 69
       }
     ],
-    "zh": [
+    "zh-CN": [
       {
         "pattern_identifier": "zh_zip_code_preserving",
-        "positive_pattern": "邮政编码|邮编|郵遞區號",
+        "positive_pattern": "邮政编码|邮编",
+        "positive_score": 1.1,
+        "negative_pattern": null,
+        "match_field_attributes": 3,
+        "match_field_input_types": 69
+      }
+    ],
+    "zh-TW": [
+      {
+        "pattern_identifier": "zh_tw_zip_code_preserving",
+        "positive_pattern": "郵遞區號",
         "positive_score": 1.1,
         "negative_pattern": null,
         "match_field_attributes": 3,
@@ -1049,7 +1051,7 @@
         "match_field_input_types": 137
       }
     ],
-    "zh": [
+    "zh-TW": [
       {
         "pattern_identifier": "zh_city_preserving",
         "positive_pattern": "市|分區",
@@ -1151,7 +1153,7 @@
         "match_field_input_types": 137
       }
     ],
-    "zh": [
+    "zh-TW": [
       {
         "pattern_identifier": "zh_state_preserving",
         "positive_pattern": "省|地區",
@@ -1233,7 +1235,7 @@
         "match_field_input_types": 145
       }
     ],
-    "zh": [
+    "zh-CN": [
       {
         "pattern_identifier": "zh_search_term_preserving",
         "positive_pattern": "搜索",
@@ -1407,7 +1409,7 @@
         "match_field_input_types": 1
       }
     ],
-    "zh": [
+    "zh-CN": [
       {
         "pattern_identifier": "zh_name_on_card_preserving",
         "positive_pattern": "信用卡开户名|开户名|持卡人姓名|持卡人姓名",
@@ -1471,10 +1473,20 @@
         "match_field_input_types": 101
       }
     ],
-    "zh": [
+    "zh-CN": [
+      {
+        "pattern_identifier": "zh_card_number_preserving",
+        "positive_pattern": "信用卡号|信用卡号码",
+        "positive_score": 1.0,
+        "negative_pattern": null,
+        "match_field_attributes": 3,
+        "match_field_input_types": 101
+      }
+    ],
+    "zh-TW": [
       {
         "pattern_identifier": "zh_card_number_preserving",
-        "positive_pattern": "信用卡号|信用卡号码|信用卡卡號",
+        "positive_pattern": "信用卡卡號",
         "positive_score": 1.0,
         "negative_pattern": null,
         "match_field_attributes": 3,
@@ -1615,7 +1627,7 @@
         "match_field_input_types": 205
       }
     ],
-    "zh": [
+    "zh-CN": [
       {
         "pattern_identifier": "zh_card_exp_month_preserving",
         "positive_pattern": "月",
@@ -1697,7 +1709,7 @@
         "match_field_input_types": 205
       }
     ],
-    "zh": [
+    "zh-CN": [
       {
         "pattern_identifier": "zh_card_exp_year_preserving",
         "positive_pattern": "年|有效期",
@@ -1937,10 +1949,20 @@
         "match_field_input_types": 3
       }
     ],
-    "zh": [
+    "zh-CN": [
+      {
+        "pattern_identifier": "zh_email_preserving",
+        "positive_pattern": "邮件|邮箱",
+        "positive_score": 1.4,
+        "negative_pattern": null,
+        "match_field_attributes": 3,
+        "match_field_input_types": 3
+      }
+    ],
+    "zh-TW": [
       {
         "pattern_identifier": "zh_email_preserving",
-        "positive_pattern": "邮件|邮箱|電郵地址",
+        "positive_pattern": "電郵地址",
         "positive_score": 1.4,
         "negative_pattern": null,
         "match_field_attributes": 3,
@@ -2029,7 +2051,7 @@
         "match_field_input_types": 137
       }
     ],
-    "zh": [
+    "zh-CN": [
       {
         "pattern_identifier": "zh_name_ignored_preserving",
         "positive_pattern": "用户名",
@@ -2111,7 +2133,7 @@
         "match_field_input_types": 1
       }
     ],
-    "zh": [
+    "zh-CN": [
       {
         "pattern_identifier": "zh_full_name_preserving",
         "positive_pattern": "姓名",
@@ -2649,7 +2671,7 @@
         "match_field_input_types": 69
       }
     ],
-    "zh": [
+    "zh-CN": [
       {
         "pattern_identifier": "zh_phone_preserving",
         "positive_pattern": "电话",

components/autofill/core/common/autofill_features.cc

@@ -191,6 +191,11 @@ const base::Feature kAutofillMetadataUploads{"AutofillMetadataUploads",
 const base::Feature kAutofillOffNoServerData{"AutofillOffNoServerData",
                                              base::FEATURE_DISABLED_BY_DEFAULT};
 
+// When enabled, Autofill will load remote patterns via the component updater.
+// TODO(crbug/1121990): Remove once launched.
+extern const base::Feature kAutofillParsingPatternsFromRemote{
+    "AutofillParsingPatternsFromRemote", base::FEATURE_DISABLED_BY_DEFAULT};
+
 // Controls whether negative patterns are used to parse the field type.
 // TODO(crbug.com/1132831): Remove once launched.
 const base::Feature kAutofillParsingPatternsNegativeMatching{
@@ -302,11 +307,6 @@ const base::Feature kAutofillUseImprovedLabelDisambiguation{
 const base::Feature kAutofillUseNewSectioningMethod{
     "AutofillUseNewSectioningMethod", base::FEATURE_DISABLED_BY_DEFAULT};
 
-// When enabled, Autofill will load remote patterns via the component updater.
-// TODO(crbug/1121990): Remove once launched.
-extern const base::Feature kAutofillParsingPatternsFromRemote{
-    "AutofillParsingPatternsFromRemote", base::FEATURE_DISABLED_BY_DEFAULT};
-
 #if defined(OS_ANDROID)
 // Controls whether the Autofill manual fallback for Addresses and Payments is
 // present on Android.