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

cc/resources/returned_resource.h

Index: cc/resources/returned_resource.h
diff --git a/cc/resources/returned_resource.h b/cc/resources/returned_resource.h
index 94a574e98138d25a23450068723fa50fb85c208c..92e57ad95d4989d41a859e6311390e8484068a32 100644
--- a/cc/resources/returned_resource.h
+++ b/cc/resources/returned_resource.h
@@ -10,6 +10,7 @@
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/resource_id.h"
+#include "gpu/command_buffer/common/sync_token.h"
 
 namespace cc {
 
@@ -17,17 +18,17 @@ namespace cc {
 // parent compositor that corresponds to a TransferableResource that was
 // first passed to the parent compositor.
 struct CC_EXPORT ReturnedResource {
-  ReturnedResource() : id(0), sync_point(0), count(0), lost(false) {}
+  ReturnedResource() : id(0), count(0), lost(false) {}
   // |id| is an identifier generated by the child compositor that uniquely
   // identifies a resource. This is the same ID space as TransferableResource.
   ResourceId id;
 
-  // A |sync_point| is an identifier for a point in the parent compositor's
+  // A |sync_token| is an identifier for a point in the parent compositor's
   // command buffer. The child compositor then issues a WaitSyncPointCHROMIUM
-  // command with this |sync_point| as a parameter into its own command buffer.
+  // command with this |sync_token| as a parameter into its own command buffer.
   // This ensures that uses of the resource submitted by the parent compositor
   // are executed before commands submitted by the child.
-  unsigned sync_point;
+  gpu::SyncToken sync_token;
 
   // |count| is a reference count for this resource. A resource may be used
   // by mulitple compositor frames submitted to the parent compositor. |count|