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

cc/resources/texture_mailbox.h

Index: cc/resources/texture_mailbox.h
diff --git a/cc/resources/texture_mailbox.h b/cc/resources/texture_mailbox.h
index 9fc0fb841d6d2f6be03096307c030c8ad0d707a8..470f94e1222a89e43a21e6a6ba00c9037fabaf5a 100644
--- a/cc/resources/texture_mailbox.h
+++ b/cc/resources/texture_mailbox.h
@@ -21,10 +21,14 @@ class CC_EXPORT TextureMailbox {
  public:
   TextureMailbox();
   explicit TextureMailbox(const gpu::MailboxHolder& mailbox_holder);
-  TextureMailbox(const gpu::Mailbox& mailbox, uint32 target, uint32 sync_point);
   TextureMailbox(const gpu::Mailbox& mailbox,
                  uint32 target,
                  uint32 sync_point,
+                 const gpu::SyncToken& sync_token);
+  TextureMailbox(const gpu::Mailbox& mailbox,
+                 uint32 target,
+                 uint32 sync_point,
+                 const gpu::SyncToken& sync_token,
                  const gfx::Size& size_in_pixels,
                  bool is_overlay_candidate);
   TextureMailbox(SharedBitmap* shared_bitmap, const gfx::Size& size_in_pixels);
@@ -41,8 +45,12 @@ class CC_EXPORT TextureMailbox {
   const int8* name() const { return mailbox().name; }
   uint32 target() const { return mailbox_holder_.texture_target; }
   uint32 sync_point() const { return mailbox_holder_.sync_point; }
-  void set_sync_point(int32 sync_point) {
+  const gpu::SyncToken& sync_token() const {
+    return mailbox_holder_.sync_token;
+  }
+  void set_sync_point(int32 sync_point, const gpu::SyncToken& sync_token) {
     mailbox_holder_.sync_point = sync_point;
+    mailbox_holder_.sync_token = sync_token;
   }
 
   bool is_overlay_candidate() const { return is_overlay_candidate_; }