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

content/renderer/pepper/pepper_compositor_host.cc

Index: content/renderer/pepper/pepper_compositor_host.cc
diff --git a/content/renderer/pepper/pepper_compositor_host.cc b/content/renderer/pepper/pepper_compositor_host.cc
index e8343ee38abfa2f4b769c02d383004dfd7b60166..c6920f39b99a2ec322f055a9babdc901baead447 100644
--- a/content/renderer/pepper/pepper_compositor_host.cc
+++ b/content/renderer/pepper/pepper_compositor_host.cc
@@ -190,18 +190,20 @@ void PepperCompositorHost::ImageReleased(
     scoped_ptr<base::SharedMemory> shared_memory,
     scoped_ptr<cc::SharedBitmap> bitmap,
     uint32_t sync_point,
+    const gpu::SyncToken& sync_token,
     bool is_lost) {
   bitmap.reset();
   shared_memory.reset();
-  ResourceReleased(id, sync_point, is_lost);
+  ResourceReleased(id, sync_point, sync_token, is_lost);
 }
 
 void PepperCompositorHost::ResourceReleased(int32_t id,
                                             uint32_t sync_point,
+                                            const gpu::SyncToken& sync_token,
                                             bool is_lost) {
-  host()->SendUnsolicitedReply(
-      pp_resource(),
-      PpapiPluginMsg_Compositor_ReleaseResource(id, sync_point, is_lost));
+  host()->SendUnsolicitedReply(pp_resource(),
+                               PpapiPluginMsg_Compositor_ReleaseResource(
+                                   id, sync_point, sync_token, is_lost));
 }
 
 void PepperCompositorHost::SendCommitLayersReplyIfNecessary() {
@@ -270,9 +272,9 @@ void PepperCompositorHost::UpdateLayer(
         static_cast<cc::TextureLayer*>(layer.get()));
     if (!old_layer ||
         new_layer->common.resource_id != old_layer->common.resource_id) {
-      cc::TextureMailbox mailbox(new_layer->texture->mailbox,
-                                 new_layer->texture->target,
-                                 new_layer->texture->sync_point);
+      cc::TextureMailbox mailbox(
+          new_layer->texture->mailbox, new_layer->texture->target,
+          new_layer->texture->sync_point, new_layer->texture->sync_token);
       texture_layer->SetTextureMailbox(mailbox,
           cc::SingleReleaseCallback::Create(
               base::Bind(&PepperCompositorHost::ResourceReleased,