[Merge to 2743] Revert "[Reland 2] Pepper takes ownership of a mailbox before passing it to the tex…

gpu/ipc/common/gpu_messages.h

Index: gpu/ipc/common/gpu_messages.h
diff --git a/gpu/ipc/common/gpu_messages.h b/gpu/ipc/common/gpu_messages.h
index b94b4c8feba58878b94a1418ad3302de4d5ad90a..6fc53494abfe6f6252e2abb98d28c922e4118cfd 100644
--- a/gpu/ipc/common/gpu_messages.h
+++ b/gpu/ipc/common/gpu_messages.h
@@ -152,17 +152,11 @@ IPC_MESSAGE_ROUTED0(GpuStreamTextureMsg_FrameAvailable)
 IPC_SYNC_MESSAGE_ROUTED1_0(GpuCommandBufferMsg_SetGetBuffer,
                            int32_t /* shm_id */)
 
-// Takes the front buffer into a mailbox. This allows another context to draw
+// Produces the front buffer into a mailbox. This allows another context to draw
 // the output of this context.
-IPC_MESSAGE_ROUTED1(GpuCommandBufferMsg_TakeFrontBuffer,
+IPC_MESSAGE_ROUTED1(GpuCommandBufferMsg_ProduceFrontBuffer,
                     gpu::Mailbox /* mailbox */)
 
-// Returns a front buffer taken with GpuCommandBufferMsg_TakeFrontBuffer. This
-// allows it to be reused.
-IPC_MESSAGE_ROUTED2(GpuCommandBufferMsg_ReturnFrontBuffer,
-                    gpu::Mailbox /* mailbox */,
-                    bool /* is_lost */)
-
 // Wait until the token is in a specific range, inclusive.
 IPC_SYNC_MESSAGE_ROUTED2_1(GpuCommandBufferMsg_WaitForTokenInRange,
                            int32_t /* start */,
@@ -214,12 +208,6 @@ IPC_MESSAGE_ROUTED2(GpuCommandBufferMsg_UpdateVSyncParameters,
                     base::TimeTicks /* timebase */,
                     base::TimeDelta /* interval */)
 
-// The receiver will stop processing messages until the Synctoken is signaled.
-IPC_MESSAGE_ROUTED1(GpuCommandBufferMsg_WaitSyncToken,
-                    gpu::SyncToken /* sync_token */)
-
-// The receiver will asynchronously wait until the SyncToken is signaled, and
-// then return a GpuCommandBufferMsg_SignalAck message.
 IPC_MESSAGE_ROUTED2(GpuCommandBufferMsg_SignalSyncToken,
                     gpu::SyncToken /* sync_token */,
                     uint32_t /* signal_id */)