| Index: content/common/child_process_sandbox_support_impl_linux.cc
|
| diff --git a/content/common/child_process_sandbox_support_impl_linux.cc b/content/common/child_process_sandbox_support_impl_linux.cc
|
| index 7c9ee4e5c53d57601d53a0a8e3e92f56f8773db2..9fe1edb7be21fe938a2ac77ee756cb4d2b111b9e 100644
|
| --- a/content/common/child_process_sandbox_support_impl_linux.cc
|
| +++ b/content/common/child_process_sandbox_support_impl_linux.cc
|
| @@ -27,7 +27,7 @@ void GetFallbackFontForCharacter(int32_t character,
|
| blink::WebFallbackFont* fallbackFont) {
|
| TRACE_EVENT0("sandbox_ipc", "GetFontFamilyForCharacter");
|
|
|
| - Pickle request;
|
| + base::Pickle request;
|
| request.WriteInt(LinuxSandbox::METHOD_GET_FALLBACK_FONT_FOR_CHAR);
|
| request.WriteInt(character);
|
| request.WriteString(preferred_locale);
|
| @@ -43,8 +43,8 @@ void GetFallbackFontForCharacter(int32_t character,
|
| bool isBold = false;
|
| bool isItalic = false;
|
| if (n != -1) {
|
| - Pickle reply(reinterpret_cast<char*>(buf), n);
|
| - PickleIterator pickle_iter(reply);
|
| + base::Pickle reply(reinterpret_cast<char*>(buf), n);
|
| + base::PickleIterator pickle_iter(reply);
|
| if (pickle_iter.ReadString(&family_name) &&
|
| pickle_iter.ReadString(&filename) &&
|
| pickle_iter.ReadInt(&fontconfigInterfaceId) &&
|
| @@ -77,7 +77,7 @@ void GetRenderStyleForStrike(const char* family,
|
| if (pixel_size > std::numeric_limits<uint16>::max())
|
| return;
|
|
|
| - Pickle request;
|
| + base::Pickle request;
|
| request.WriteInt(LinuxSandbox::METHOD_GET_STYLE_FOR_STRIKE);
|
| request.WriteString(family);
|
| request.WriteBool(bold);
|
| @@ -90,8 +90,8 @@ void GetRenderStyleForStrike(const char* family,
|
| if (n == -1)
|
| return;
|
|
|
| - Pickle reply(reinterpret_cast<char*>(buf), n);
|
| - PickleIterator pickle_iter(reply);
|
| + base::Pickle reply(reinterpret_cast<char*>(buf), n);
|
| + base::PickleIterator pickle_iter(reply);
|
| int use_bitmaps, use_autohint, use_hinting, hint_style, use_antialias;
|
| int use_subpixel_rendering, use_subpixel_positioning;
|
| if (pickle_iter.ReadInt(&use_bitmaps) &&
|
| @@ -118,7 +118,7 @@ int MatchFontWithFallback(const std::string& face,
|
| PP_BrowserFont_Trusted_Family fallback_family) {
|
| TRACE_EVENT0("sandbox_ipc", "MatchFontWithFallback");
|
|
|
| - Pickle request;
|
| + base::Pickle request;
|
| request.WriteInt(LinuxSandbox::METHOD_MATCH_WITH_FALLBACK);
|
| request.WriteString(face);
|
| request.WriteBool(bold);
|
|
|