Modified old wait sync point functions to also accept new sync tokens.

content/renderer/gpu/mailbox_output_surface.h

Index: content/renderer/gpu/mailbox_output_surface.h
diff --git a/content/renderer/gpu/mailbox_output_surface.h b/content/renderer/gpu/mailbox_output_surface.h
index fc789c48693b2d3aff629dba08a43b1c82e3f115..a812934d3a798824cd5ced82984df8496e377899 100644
--- a/content/renderer/gpu/mailbox_output_surface.h
+++ b/content/renderer/gpu/mailbox_output_surface.h
@@ -52,17 +52,15 @@ class MailboxOutputSurface : public CompositorOutputSurface {
   size_t GetNumAcksPending();
 
   struct TransferableFrame {
-    TransferableFrame() : texture_id(0), sync_point(0) {}
-
+    TransferableFrame();
     TransferableFrame(uint32 texture_id,
                       const gpu::Mailbox& mailbox,
-                      const gfx::Size size)
-        : texture_id(texture_id), mailbox(mailbox), size(size), sync_point(0) {}
+                      const gfx::Size size);
 
     uint32 texture_id;
     gpu::Mailbox mailbox;
+    gpu::SyncToken sync_token;
     gfx::Size size;
-    uint32 sync_point;
   };
 
   TransferableFrame current_backing_;