| Index: chrome/browser/autofill/autofill_merge_unittest.cc | 
| diff --git a/chrome/browser/autofill/autofill_merge_unittest.cc b/chrome/browser/autofill/autofill_merge_unittest.cc | 
| index 2e51e2d657927865a63ff5096c7df2f90cb3ceb4..2c3303a6c890e07b6c64d3d77546788bc13c64f8 100644 | 
| --- a/chrome/browser/autofill/autofill_merge_unittest.cc | 
| +++ b/chrome/browser/autofill/autofill_merge_unittest.cc | 
| @@ -179,7 +179,7 @@ void AutofillMergeTest::MergeProfiles(const std::string& profiles, | 
| field.label = field_type; | 
| field.name = field_type; | 
| field.value = value; | 
| -      field.form_control_type = ASCIIToUTF16("text"); | 
| +      field.form_control_type = "text"; | 
| form.fields.push_back(field); | 
| } | 
|  | 
|  |