| Index: chrome/common/form_field_data.h | 
| diff --git a/chrome/common/form_field_data.h b/chrome/common/form_field_data.h | 
| index 286fb727293e41e575650e8d2a9cadadaccf331a..de9375f6d4152c2a421b8865f5fa3bcdbc88df00 100644 | 
| --- a/chrome/common/form_field_data.h | 
| +++ b/chrome/common/form_field_data.h | 
| @@ -26,8 +26,8 @@ struct FormFieldData { | 
| string16 label; | 
| string16 name; | 
| string16 value; | 
| -  string16 form_control_type; | 
| -  string16 autocomplete_type; | 
| +  std::string form_control_type; | 
| +  std::string autocomplete_attribute; | 
| size_t max_length; | 
| bool is_autofilled; | 
| bool is_focusable; | 
| @@ -50,7 +50,7 @@ std::ostream& operator<<(std::ostream& os, const FormFieldData& field); | 
| EXPECT_EQ(expected.name, actual.name); \ | 
| EXPECT_EQ(expected.value, actual.value); \ | 
| EXPECT_EQ(expected.form_control_type, actual.form_control_type); \ | 
| -    EXPECT_EQ(expected.autocomplete_type, actual.autocomplete_type); \ | 
| +    EXPECT_EQ(expected.autocomplete_attribute, actual.autocomplete_attribute); \ | 
| EXPECT_EQ(expected.max_length, actual.max_length); \ | 
| EXPECT_EQ(expected.is_autofilled, actual.is_autofilled); \ | 
| } while (0) | 
|  |