autofill: switch autofill_regexes to RE2 library

components/autofill/core/browser/form_field.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.
 
 #include "components/autofill/core/browser/form_field.h"
 
 #include <stddef.h>
 #include <string>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"

[Ilya Sherman, 2015/11/26 02:25:09]

nit: Is this include still needed?  Please check this for other files in this CL
as well.

[tfarina, 2015/11/26 14:22:27]

Done.

 #include "components/autofill/core/browser/address_field.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_scanner.h"
 #include "components/autofill/core/browser/credit_card_field.h"
 #include "components/autofill/core/browser/email_field.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/browser/name_field.h"
 #include "components/autofill/core/browser/phone_field.h"
 #include "components/autofill/core/common/autofill_regexes.h"
 
@@ skipping 51 matching lines @@
   // only recognized field on account registration sites.
   size_t kThreshold = 3;
   bool accept_parsing = (map->size() >= kThreshold ||
                          (is_form_tag && email_count > 0));
   if (!accept_parsing)
     *map = saved_map;
 }
 
 // static
 bool FormField::ParseField(AutofillScanner* scanner,
-                           const base::string16& pattern,
+                           const std::string& pattern,
                            AutofillField** match) {
   return ParseFieldSpecifics(scanner, pattern, MATCH_DEFAULT, match);
 }
 
 // static
 bool FormField::ParseFieldSpecifics(AutofillScanner* scanner,
-                                    const base::string16& pattern,
+                                    const std::string& pattern,
                                     int match_type,
                                     AutofillField** match) {
   if (scanner->IsEnd())
     return false;
 
   const AutofillField* field = scanner->Cursor();
 
   if (!MatchesFormControlType(field->form_control_type, match_type))
     return false;
 
   return MatchAndAdvance(scanner, pattern, match_type, match);
 }
 
 // static
 FormField::ParseNameLabelResult FormField::ParseNameAndLabelSeparately(
     AutofillScanner* scanner,
-    const base::string16& pattern,
+    const std::string& pattern,
     int match_type,
     AutofillField** match) {
   if (scanner->IsEnd())
     return RESULT_MATCH_NONE;
 
   AutofillField* cur_match = nullptr;
   size_t saved_cursor = scanner->SaveCursor();
   bool parsed_name = ParseFieldSpecifics(scanner,
                                          pattern,
                                          match_type & ~MATCH_LABEL,
@@ skipping 14 matching lines @@
     return RESULT_MATCH_NAME;
   if (parsed_label)
     return RESULT_MATCH_LABEL;
   return RESULT_MATCH_NONE;
 }
 
 // static
 bool FormField::ParseEmptyLabel(AutofillScanner* scanner,
                                 AutofillField** match) {
   return ParseFieldSpecifics(scanner,
-                             base::ASCIIToUTF16("^$"),
+                             "^$",
                              MATCH_LABEL | MATCH_ALL_INPUTS,
                              match);
 }
 
 // static
 bool FormField::AddClassification(const AutofillField* field,
                                   ServerFieldType type,
                                   ServerFieldTypeMap* map) {
   // Several fields are optional.
   if (!field)
     return true;
 
   return map->insert(make_pair(field->unique_name(), type)).second;
 }
 
 // static.
 bool FormField::MatchAndAdvance(AutofillScanner* scanner,
-                                const base::string16& pattern,
+                                const std::string& pattern,
                                 int match_type,
                                 AutofillField** match) {
   AutofillField* field = scanner->Cursor();
   if (FormField::Match(field, pattern, match_type)) {
     if (match)
       *match = field;
     scanner->Advance();
     return true;
   }
 
   return false;
 }
 
 // static
 bool FormField::Match(const AutofillField* field,
-                      const base::string16& pattern,
+                      const std::string& pattern,
                       int match_type) {
   if ((match_type & FormField::MATCH_LABEL) &&
       MatchesPattern(field->label, pattern)) {
     return true;
   }
 
   if ((match_type & FormField::MATCH_NAME) &&
       MatchesPattern(field->name, pattern)) {
     return true;
   }
@@ skipping 45 matching lines @@
   if ((match_type & MATCH_PASSWORD) && type == "password")
     return true;
 
   if ((match_type & MATCH_NUMBER) && type == "number")
     return true;
 
   return false;
 }
 
 }  // namespace autofill