| Index: content/common/font_config_ipc_linux.cc
|
| diff --git a/content/common/font_config_ipc_linux.cc b/content/common/font_config_ipc_linux.cc
|
| index 540d7d88825c61d660eda9c2591b2adeb6b51054..f063abde4d142edae8a7d4334d2d657bc8c65633 100644
|
| --- a/content/common/font_config_ipc_linux.cc
|
| +++ b/content/common/font_config_ipc_linux.cc
|
| @@ -90,7 +90,7 @@ bool FontConfigIPC::matchFamilyName(const char familyName[],
|
| if (familyNameLen > kMaxFontFamilyLength)
|
| return false;
|
|
|
| - Pickle request;
|
| + base::Pickle request;
|
| request.WriteInt(METHOD_MATCH);
|
| request.WriteData(familyName, familyNameLen);
|
| request.WriteUInt32(requestedStyle);
|
| @@ -102,8 +102,8 @@ bool FontConfigIPC::matchFamilyName(const char familyName[],
|
| if (r == -1)
|
| return false;
|
|
|
| - Pickle reply(reinterpret_cast<char*>(reply_buf), r);
|
| - PickleIterator iter(reply);
|
| + base::Pickle reply(reinterpret_cast<char*>(reply_buf), r);
|
| + base::PickleIterator iter(reply);
|
| bool result;
|
| if (!iter.ReadBool(&result))
|
| return false;
|
| @@ -139,7 +139,7 @@ SkStreamAsset* FontConfigIPC::openStream(const FontIdentity& identity) {
|
| return mapped_font_files_it->second->CreateMemoryStream();
|
| }
|
|
|
| - Pickle request;
|
| + base::Pickle request;
|
| request.WriteInt(METHOD_OPEN);
|
| request.WriteUInt32(identity.fID);
|
|
|
| @@ -152,9 +152,9 @@ SkStreamAsset* FontConfigIPC::openStream(const FontIdentity& identity) {
|
| if (r == -1)
|
| return NULL;
|
|
|
| - Pickle reply(reinterpret_cast<char*>(reply_buf), r);
|
| + base::Pickle reply(reinterpret_cast<char*>(reply_buf), r);
|
| bool result;
|
| - PickleIterator iter(reply);
|
| + base::PickleIterator iter(reply);
|
| if (!iter.ReadBool(&result) || !result) {
|
| if (result_fd)
|
| CloseFD(result_fd);
|
|
|