Index: components/autofill/core/browser/form_field.cc |
diff --git a/components/autofill/core/browser/form_field.cc b/components/autofill/core/browser/form_field.cc |
index 50d7e8a30a81cf74343e3656627695840085f9cf..69a3771234b9cbd00bb6dd7b21c29a4ff6c33b2d 100644 |
--- a/components/autofill/core/browser/form_field.cc |
+++ b/components/autofill/core/browser/form_field.cc |
@@ -12,7 +12,6 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/strings/string_util.h" |
#include "base/strings/stringprintf.h" |
-#include "base/strings/utf_string_conversions.h" |
#include "components/autofill/core/browser/address_field.h" |
#include "components/autofill/core/browser/autofill_field.h" |
#include "components/autofill/core/browser/autofill_scanner.h" |
@@ -84,14 +83,14 @@ void FormField::ParseFormFields(const std::vector<AutofillField*>& fields, |
// 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()) |
@@ -108,7 +107,7 @@ bool FormField::ParseFieldSpecifics(AutofillScanner* scanner, |
// static |
FormField::ParseNameLabelResult FormField::ParseNameAndLabelSeparately( |
AutofillScanner* scanner, |
- const base::string16& pattern, |
+ const std::string& pattern, |
int match_type, |
AutofillField** match) { |
if (scanner->IsEnd()) |
@@ -143,7 +142,7 @@ FormField::ParseNameLabelResult FormField::ParseNameAndLabelSeparately( |
bool FormField::ParseEmptyLabel(AutofillScanner* scanner, |
AutofillField** match) { |
return ParseFieldSpecifics(scanner, |
- base::ASCIIToUTF16("^$"), |
+ "^$", |
MATCH_LABEL | MATCH_ALL_INPUTS, |
match); |
} |
@@ -161,7 +160,7 @@ bool FormField::AddClassification(const AutofillField* field, |
// static. |
bool FormField::MatchAndAdvance(AutofillScanner* scanner, |
- const base::string16& pattern, |
+ const std::string& pattern, |
int match_type, |
AutofillField** match) { |
AutofillField* field = scanner->Cursor(); |
@@ -177,7 +176,7 @@ bool FormField::MatchAndAdvance(AutofillScanner* scanner, |
// 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)) { |