Run HostDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemoryForChild on FILE_USER_…

content/browser/renderer_host/render_message_filter.cc

Index: content/browser/renderer_host/render_message_filter.cc
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 9b61d528db3af68f620adf06233d50dd546a7f94..9fa9a4e41bd194af50edfb844c7cddea0b8b7a0d 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -418,7 +418,7 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message) {
                         OnAllocatedSharedBitmap)
     IPC_MESSAGE_HANDLER(ChildProcessHostMsg_DeletedSharedBitmap,
                         OnDeletedSharedBitmap)
-    IPC_MESSAGE_HANDLER(
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(
         ChildProcessHostMsg_SyncAllocateLockedDiscardableSharedMemory,
         OnAllocateLockedDiscardableSharedMemory)
     IPC_MESSAGE_HANDLER(ChildProcessHostMsg_DeletedDiscardableSharedMemory,
@@ -953,21 +953,45 @@ void RenderMessageFilter::OnDeletedSharedBitmap(const cc::SharedBitmapId& id) {
   bitmap_manager_client_.ChildDeletedSharedBitmap(id);
 }
 
-void RenderMessageFilter::OnAllocateLockedDiscardableSharedMemory(
+void RenderMessageFilter::AllocateLockedDiscardableSharedMemoryOnFileThread(
     uint32 size,
     DiscardableSharedMemoryId id,
-    base::SharedMemoryHandle* handle) {
+    IPC::Message* reply_msg) {
+  base::SharedMemoryHandle handle;
   HostDiscardableSharedMemoryManager::current()
       ->AllocateLockedDiscardableSharedMemoryForChild(PeerHandle(), size, id,
-                                                      handle);
+                                                      &handle);
+  ChildProcessHostMsg_SyncAllocateLockedDiscardableSharedMemory::
+      WriteReplyParams(reply_msg, handle);
+  Send(reply_msg);
 }
 
-void RenderMessageFilter::OnDeletedDiscardableSharedMemory(
+void RenderMessageFilter::OnAllocateLockedDiscardableSharedMemory(
+    uint32 size,
+    DiscardableSharedMemoryId id,
+    IPC::Message* reply_msg) {
+  BrowserThread::PostTask(
+      BrowserThread::FILE_USER_BLOCKING, FROM_HERE,
+      base::Bind(&RenderMessageFilter::
+                     AllocateLockedDiscardableSharedMemoryOnFileThread,
+                 this, size, id, reply_msg));
+}
+
+void RenderMessageFilter::DeletedDiscardableSharedMemoryOnFileThread(
     DiscardableSharedMemoryId id) {
   HostDiscardableSharedMemoryManager::current()
       ->ChildDeletedDiscardableSharedMemory(id, PeerHandle());
 }
 
+void RenderMessageFilter::OnDeletedDiscardableSharedMemory(
+    DiscardableSharedMemoryId id) {
+  BrowserThread::PostTask(
+      BrowserThread::FILE_USER_BLOCKING, FROM_HERE,
+      base::Bind(
+          &RenderMessageFilter::DeletedDiscardableSharedMemoryOnFileThread,
+          this, id));
+}
+
 net::CookieStore* RenderMessageFilter::GetCookieStoreForURL(
     const GURL& url) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);