| Index: components/autofill/core/browser/autofill_merge_unittest.cc
|
| diff --git a/components/autofill/core/browser/autofill_merge_unittest.cc b/components/autofill/core/browser/autofill_merge_unittest.cc
|
| index 99ab99aa3c18878c85c2cfa1a73cf5dcf01f3275..7672a05efd5f9869c9aaeba67a7ed12781bdb3e7 100644
|
| --- a/components/autofill/core/browser/autofill_merge_unittest.cc
|
| +++ b/components/autofill/core/browser/autofill_merge_unittest.cc
|
| @@ -70,7 +70,7 @@ std::string SerializeProfiles(const std::vector<AutofillProfile*>& profiles) {
|
| for (size_t k = 0; k < values.size(); ++k) {
|
| result += AutofillType(type).ToString();
|
| result += kFieldSeparator;
|
| - result += UTF16ToUTF8(values[k]);
|
| + result += base::UTF16ToUTF8(values[k]);
|
| result += "\n";
|
| }
|
| }
|
| @@ -185,8 +185,8 @@ void AutofillMergeTest::MergeProfiles(const std::string& profiles,
|
|
|
| // Create a test form.
|
| FormData form;
|
| - form.name = ASCIIToUTF16("MyTestForm");
|
| - form.method = ASCIIToUTF16("POST");
|
| + form.name = base::ASCIIToUTF16("MyTestForm");
|
| + form.method = base::ASCIIToUTF16("POST");
|
| form.origin = GURL("https://www.example.com/origin.html");
|
| form.action = GURL("https://www.example.com/action.html");
|
| form.user_submitted = true;
|
| @@ -201,9 +201,10 @@ void AutofillMergeTest::MergeProfiles(const std::string& profiles,
|
| // Add a field to the current profile.
|
| size_t separator_pos = line.find(kFieldSeparator);
|
| ASSERT_NE(std::string::npos, separator_pos);
|
| - base::string16 field_type = UTF8ToUTF16(line.substr(0, separator_pos));
|
| + base::string16 field_type =
|
| + base::UTF8ToUTF16(line.substr(0, separator_pos));
|
| base::string16 value =
|
| - UTF8ToUTF16(line.substr(separator_pos + kFieldOffset));
|
| + base::UTF8ToUTF16(line.substr(separator_pos + kFieldOffset));
|
|
|
| FormFieldData field;
|
| field.label = field_type;
|
| @@ -223,7 +224,8 @@ void AutofillMergeTest::MergeProfiles(const std::string& profiles,
|
| // into the field's name.
|
| AutofillField* field =
|
| const_cast<AutofillField*>(form_structure.field(i));
|
| - ServerFieldType type = StringToFieldType(UTF16ToUTF8(field->name));
|
| + ServerFieldType type =
|
| + StringToFieldType(base::UTF16ToUTF8(field->name));
|
| field->set_heuristic_type(type);
|
| }
|
|
|
|
|