Fork cc::OutputSurface into cc::CompositorFrameSink.

content/common/android/sync_compositor_messages.h

Index: content/common/android/sync_compositor_messages.h
diff --git a/content/common/android/sync_compositor_messages.h b/content/common/android/sync_compositor_messages.h
index 3d1d2348d478d4ad0ed0fab2e69813a224eac372..e7e41d6e5d0d5d744a63be8402a8644cdfe1fd79 100644
--- a/content/common/android/sync_compositor_messages.h
+++ b/content/common/android/sync_compositor_messages.h
@@ -130,7 +130,7 @@ IPC_MESSAGE_ROUTED1(SyncCompositorMsg_DemandDrawHwAsync,
 IPC_SYNC_MESSAGE_ROUTED1_3(SyncCompositorMsg_DemandDrawHw,
                            content::SyncCompositorDemandDrawHwParams,
                            content::SyncCompositorCommonRendererParams,
-                           uint32_t /* output_surface_id */,
+                           uint32_t /* compositor_frame_sink_id */,
                            cc::CompositorFrame)
 
 IPC_SYNC_MESSAGE_ROUTED1_2(SyncCompositorMsg_SetSharedMemory,
@@ -155,7 +155,7 @@ IPC_MESSAGE_ROUTED1(SyncCompositorMsg_SetMemoryPolicy,
                     uint32_t /* bytes_limit */);
 
 IPC_MESSAGE_ROUTED2(SyncCompositorMsg_ReclaimResources,
-                    uint32_t /* output_surface_id */,
+                    uint32_t /* compositor_frame_sink_id */,
                     cc::ReturnedResourceArray /* resources */);
 
 IPC_MESSAGE_ROUTED1(SyncCompositorMsg_SetScroll, gfx::ScrollOffset);
@@ -163,11 +163,11 @@ IPC_MESSAGE_ROUTED1(SyncCompositorMsg_SetScroll, gfx::ScrollOffset);
 // -----------------------------------------------------------------------------
 // Messages sent from the renderer to the browser.
 
-IPC_MESSAGE_ROUTED0(SyncCompositorHostMsg_OutputSurfaceCreated);
+IPC_MESSAGE_ROUTED0(SyncCompositorHostMsg_CompositorFrameSinkCreated);
 
 IPC_MESSAGE_ROUTED1(SyncCompositorHostMsg_UpdateState,
                     content::SyncCompositorCommonRendererParams)
 
 IPC_MESSAGE_ROUTED2(SyncCompositorHostMsg_ReturnFrame,
-                    uint32_t /* output_surface_id */,
+                    uint32_t /* compositor_frame_sink_id */,
                     cc::CompositorFrame);