| Index: content/child/child_thread_impl.cc | 
| diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc | 
| index ca970ec4b94f45f4f3c8869647da0f937c632487..20ca404c63d8469b9cc72f50c63e30c064fa330e 100644 | 
| --- a/content/child/child_thread_impl.cc | 
| +++ b/content/child/child_thread_impl.cc | 
| @@ -69,6 +69,10 @@ | 
| #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" | 
| #endif | 
|  | 
| +#if defined(OS_MACOSX) && !defined(OS_IOS) | 
| +#include "content/child/child_io_surface_manager_mac.h" | 
| +#endif | 
| + | 
| using tracked_objects::ThreadData; | 
|  | 
| namespace content { | 
| @@ -578,6 +582,10 @@ bool ChildThreadImpl::OnMessageReceived(const IPC::Message& msg) { | 
| #if defined(USE_TCMALLOC) | 
| IPC_MESSAGE_HANDLER(ChildProcessMsg_GetTcmallocStats, OnGetTcmallocStats) | 
| #endif | 
| +#if defined(OS_MACOSX) && !defined(OS_IOS) | 
| +    IPC_MESSAGE_HANDLER(ChildProcessMsg_SetIOSurfaceManagerToken, | 
| +                        OnSetIOSurfaceManagerToken) | 
| +#endif | 
| IPC_MESSAGE_UNHANDLED(handled = false) | 
| IPC_END_MESSAGE_MAP() | 
|  | 
| @@ -634,6 +642,13 @@ void ChildThreadImpl::OnGetTcmallocStats() { | 
| } | 
| #endif | 
|  | 
| +#if defined(OS_MACOSX) && !defined(OS_IOS) | 
| +void ChildThreadImpl::OnSetIOSurfaceManagerToken( | 
| +    const IOSurfaceManagerToken& token) { | 
| +  ChildIOSurfaceManager::GetInstance()->set_token(token); | 
| +} | 
| +#endif | 
| + | 
| ChildThreadImpl* ChildThreadImpl::current() { | 
| return g_lazy_tls.Pointer()->Get(); | 
| } | 
|  |