| Index: ipc/ipc_message_utils.h
|
| diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
|
| index e9c0ba0b0b4dcab95b6f858ead552847425260de..24b38af68ee18c92b0829f7309d712658acd2c08 100644
|
| --- a/ipc/ipc_message_utils.h
|
| +++ b/ipc/ipc_message_utils.h
|
| @@ -265,8 +265,8 @@ struct ParamTraits<std::wstring> {
|
| // need this trait.
|
| #if !defined(WCHAR_T_IS_UTF16)
|
| template <>
|
| -struct ParamTraits<string16> {
|
| - typedef string16 param_type;
|
| +struct ParamTraits<base::string16> {
|
| + typedef base::string16 param_type;
|
| static void Write(Message* m, const param_type& p) {
|
| m->WriteString16(p);
|
| }
|
|
|