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

cc/output/gl_frame_data.h

Index: cc/output/gl_frame_data.h
diff --git a/cc/output/gl_frame_data.h b/cc/output/gl_frame_data.h
index d633d74c49e948655bad35956eaf2c6926723d9c..daa7bbe3f8e5a6c3b92c1e339c9fdd7b0fbe6170 100644
--- a/cc/output/gl_frame_data.h
+++ b/cc/output/gl_frame_data.h
@@ -10,6 +10,7 @@
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "gpu/command_buffer/common/mailbox.h"
+#include "gpu/command_buffer/common/sync_token.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -21,6 +22,7 @@ class CC_EXPORT GLFrameData {
   ~GLFrameData();
 
   gpu::Mailbox mailbox;
+  gpu::SyncToken sync_token;
   uint32 sync_point;
   gfx::Size size;
   gfx::Rect sub_buffer_rect;