Revert of Label non-capturing groups if no capturing needed

components/autofill/core/browser/autofill_regex_constants.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.
 
 // This file contains UTF8 strings that we want as char arrays.  To avoid
 // different compilers, we use a script to convert the UTF8 strings into
 // numeric literals (\x##).
 
 #include "components/autofill/core/browser/autofill_regex_constants.h"
 
 // This macro is to workaround the fact that RE2 library only supports ASCII
 // word boundaries and it is supposed to be the same as \b.
-#define WORDBREAK "(?:\\A|\\z|\\PL)"
+#define WORDBREAK "(\\A|\\z|\\PL)"
 
 namespace autofill {
 
 /////////////////////////////////////////////////////////////////////////////
 // address_field.cc
 /////////////////////////////////////////////////////////////////////////////
 const char kAttentionIgnoredRe[] = "attention|attn";
 const char kRegionIgnoredRe[] =
     "province|region|other"
     "|provincia"  // es
     "|bairro|suburb";  // pt-BR, pt-PT
 const char kCompanyRe[] =
     "company|business|organization|organisation"
     "|firma|firmenname"  // de-DE
     "|empresa"  // es
     "|societe|société"  // fr-FR
     "|ragione.?sociale"  // it-IT
     "|会社"  // ja-JP
     "|название.?компании"  // ru
     "|单位|公司"  // zh-CN
     "|회사|직장";  // ko-KR
 const char kAddressLine1Re[] =
     "address.*line|address1|addr1|street"
-    "|(?:shipping|billing)address$"
+    "|(shipping|billing)address$"
     "|strasse|straße|hausnummer|housenumber"  // de-DE
     "|house.?name"  // en-GB
     "|direccion|dirección"  // es
     "|adresse"  // fr-FR
     "|indirizzo"  // it-IT
     "|住所1"  // ja-JP
     "|morada|endereço"  // pt-BR, pt-PT
     "|Адрес"  // ru
     "|地址"  // zh-CN
     "|주소.?1";  // ko-KR
@@ skipping 73 matching lines @@
     "|estado|provincia"  // pt-BR, pt-PT
     "|область"  // ru
     "|省"  // zh-CN
     "|地區"  // zh-TW
     "|^시[·・]?도";  // ko-KR
 
 /////////////////////////////////////////////////////////////////////////////
 // credit_card_field.cc
 /////////////////////////////////////////////////////////////////////////////
 const char kNameOnCardRe[] =
-    "card.?(?:holder|owner)|name.*" WORDBREAK "on" WORDBREAK ".*card"
-    "|(?:card|cc).?name|cc.?full.?name"
+    "card.?(holder|owner)|name.*" WORDBREAK "on" WORDBREAK ".*card"
+    "|(card|cc).?name|cc.?full.?name"
     "|karteninhaber"  // de-DE
     "|nombre.*tarjeta"  // es
     "|nom.*carte"  // fr-FR
     "|nome.*cart"  // it-IT
     "|名前"  // ja-JP
     "|Имя.*карты"  // ru
     "|信用卡开户名|开户名|持卡人姓名"  // zh-CN
     "|持卡人姓名";  // zh-TW
 const char kNameOnCardContextualRe[] =
     "name";
 const char kCardNumberRe[] =
-    "(?:card|cc|acct).?(?:number|#|no|num)"
+    "(card|cc|acct).?(number|#|no|num)"
     "|nummer"  // de-DE
     "|credito|numero|número"  // es
     "|numéro"  // fr-FR
     "|カード番号"  // ja-JP
     "|Номер.*карты"  // ru
     "|信用卡号|信用卡号码"  // zh-CN
     "|信用卡卡號"  // zh-TW
     "|카드";  // ko-KR
 const char kCardCvcRe[] =
     "verification|card identification|security code|card code"
@@ skipping 17 matching lines @@
     "|gueltig|gültig|monat"  // de-DE
     "|fecha"  // es
     "|date.*exp"  // fr-FR
     "|scadenza"  // it-IT
     "|有効期限"  // ja-JP
     "|validade"  // pt-BR, pt-PT
     "|Срок действия карты"  // ru
     "|月";  // zh-CN
 const char kExpirationYearRe[] =
     "exp|^/|year"
-    "|ablaufdatum|gueltig|gültig|jahr"  // de-DE
+    "|ablaufdatum|gueltig|gültig|yahr"  // de-DE
     "|fecha"  // es
     "|scadenza"  // it-IT
     "|有効期限"  // ja-JP
     "|validade"  // pt-BR, pt-PT
     "|Срок действия карты"  // ru
     "|年|有效期";  // zh-CN
 
 // The "yy" portion of the regex is just looking for two adjacent y's.
 const char kExpirationDate2DigitYearRe[] =
-    "(?:exp.*date.*|mm\\s*[-/]\\s*)[^y]yy([^y]|$)";
+    "(exp.*date.*|mm\\s*[-/]\\s*)[^y]yy([^y]|$)";
 const char kExpirationDate4DigitYearRe[] =
     "^mm\\s*[-/]\\syyyy$";
 const char kExpirationDateRe[] =
     "expir|exp.*date"
     "|gueltig|gültig"  // de-DE
     "|fecha"  // es
     "|date.*exp"  // fr-FR
     "|scadenza"  // it-IT
     "|有効期限"  // ja-JP
     "|validade"  // pt-BR, pt-PT
     "|Срок действия карты";  // ru
 const char kGiftCardRe[] =
     "gift.?card";
 const char kDebitGiftCardRe[] =
-    "(?:visa|mastercard|discover|amex|american express).*gift.?card";
+    "(visa|mastercard|discover|amex|american express).*gift.?card";
 const char kDebitCardRe[] =
     "debit.*card";
 
 
 /////////////////////////////////////////////////////////////////////////////
 // email_field.cc
 /////////////////////////////////////////////////////////////////////////////
 const char kEmailRe[] =
     "e.?mail"
     "|courriel"  // fr
     "|メールアドレス"  // ja-JP
     "|Электронной.?Почты"  // ru
     "|邮件|邮箱"  // zh-CN
     "|電郵地址"  // zh-TW
-    "|(?:이메일|전자.?우편|[Ee]-?mail)(.?주소)?";  // ko-KR
+    "|(이메일|전자.?우편|[Ee]-?mail)(.?주소)?";  // ko-KR
 
 
 /////////////////////////////////////////////////////////////////////////////
 // name_field.cc
 /////////////////////////////////////////////////////////////////////////////
 const char kNameIgnoredRe[] =
     "user.?name|user.?id|nickname|maiden name|title|prefix|suffix"
     "|vollständiger.?name"  // de-DE
     "|用户名"  // zh-CN
-    "|(?:사용자.?)?아이디|사용자.?ID";  // ko-KR
+    "|(사용자.?)?아이디|사용자.?ID";  // ko-KR
 const char kNameRe[] =
     "^name|full.?name|your.?name|customer.?name|bill.?name|ship.?name"
     "|name.*first.*last|firstandlastname"
     "|nombre.*y.*apellidos"  // es
     "|^nom"  // fr-FR
     "|お名前|氏名"  // ja-JP
     "|^nome"  // pt-BR, pt-PT
     "|姓名"  // zh-CN
     "|성명";  // ko-KR
 const char kNameSpecificRe[] =
@@ skipping 30 matching lines @@
 /////////////////////////////////////////////////////////////////////////////
 const char kPhoneRe[] =
     "phone|mobile"
     "|telefonnummer"  // de-DE
     "|telefono|teléfono"  // es
     "|telfixe"  // fr-FR
     "|電話"  // ja-JP
     "|telefone|telemovel"  // pt-BR, pt-PT
     "|телефон"  // ru
     "|电话"  // zh-CN
-    "|(?:전화|핸드폰|휴대폰|휴대전화)(?:.?번호)?";  // ko-KR
+    "|(전화|핸드폰|휴대폰|휴대전화)(.?번호)?";  // ko-KR
 const char kCountryCodeRe[] =
     "country.*code|ccode|_cc";
 const char kAreaCodeNotextRe[] =
     "^\\($";
 const char kAreaCodeRe[] =
     "area.*code|acode|area"
     "|지역.?번호";  // ko-KR
 const char kPhonePrefixSeparatorRe[] =
     "^-$|^\\)$";
 const char kPhoneSuffixSeparatorRe[] =
     "^-$";
 const char kPhonePrefixRe[] =
     "prefix|exchange"
     "|preselection"  // fr-FR
     "|ddd";  // pt-BR, pt-PT
 const char kPhoneSuffixRe[] =
     "suffix";
 const char kPhoneExtensionRe[] =
     WORDBREAK "ext|ext" WORDBREAK "|extension"
     "|ramal";  // pt-BR, pt-PT
 
 }  // namespace autofill
 
 #undef WORDBREAK