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

cc/layers/texture_layer.h

Index: cc/layers/texture_layer.h
diff --git a/cc/layers/texture_layer.h b/cc/layers/texture_layer.h
index 0c0b2ec237d948b2be265aa66298a70f4fe5884a..b1e92431e9ff45bfc1866c6bc3ec507429d70ec2 100644
--- a/cc/layers/texture_layer.h
+++ b/cc/layers/texture_layer.h
@@ -14,6 +14,10 @@
 #include "cc/layers/layer.h"
 #include "cc/resources/texture_mailbox.h"
 
+namespace gpu {
+struct SyncToken;
+}
+
 namespace cc {
 class BlockingTaskRunner;
 class SingleReleaseCallback;
@@ -38,7 +42,7 @@ class CC_EXPORT TextureLayer : public Layer {
     };
 
     const TextureMailbox& mailbox() const { return mailbox_; }
-    void Return(uint32 sync_point, bool is_lost);
+    void Return(const gpu::SyncToken& sync_token, bool is_lost);
 
     // Gets a ReleaseCallback that can be called from another thread. Note: the
     // caller must ensure the callback is called.
@@ -63,7 +67,7 @@ class CC_EXPORT TextureLayer : public Layer {
     void InternalAddRef();
     void InternalRelease();
     void ReturnAndReleaseOnImplThread(
-        uint32 sync_point,
+        const gpu::SyncToken& sync_token,
         bool is_lost,
         BlockingTaskRunner* main_thread_task_runner);
 
@@ -73,12 +77,12 @@ class CC_EXPORT TextureLayer : public Layer {
     TextureMailbox mailbox_;
     scoped_ptr<SingleReleaseCallback> release_callback_;
 
-    // This lock guards the sync_point_ and is_lost_ fields because they can be
+    // This lock guards the sync_token_ and is_lost_ fields because they can be
     // accessed on both the impl and main thread. We do this to ensure that the
     // values of these fields are well-ordered such that the last call to
     // ReturnAndReleaseOnImplThread() defines their values.
     base::Lock arguments_lock_;
-    uint32 sync_point_;
+    gpu::SyncToken sync_token_;
     bool is_lost_;
     base::ThreadChecker main_thread_checker_;
     DISALLOW_COPY_AND_ASSIGN(TextureMailboxHolder);