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

content/browser/compositor/owned_mailbox.cc

Index: content/browser/compositor/owned_mailbox.cc
diff --git a/content/browser/compositor/owned_mailbox.cc b/content/browser/compositor/owned_mailbox.cc
index 9c7b37861f4d59db80730bdd9432bec3f12fbed7..912d4d569b7f106dae3f2b2b73c5aab5ef6eaa1a 100644
--- a/content/browser/compositor/owned_mailbox.cc
+++ b/content/browser/compositor/owned_mailbox.cc
@@ -22,14 +22,14 @@ OwnedMailbox::~OwnedMailbox() {
     Destroy();
 }
 
-void OwnedMailbox::UpdateSyncPoint(uint32 sync_point) {
-  if (sync_point)
-    mailbox_holder_.sync_point = sync_point;
+void OwnedMailbox::UpdateSyncToken(const gpu::SyncToken& sync_token) {
+  if (sync_token.HasData())
+    mailbox_holder_.sync_token = sync_token;
 }
 
 void OwnedMailbox::Destroy() {
   ImageTransportFactory::GetInstance()->RemoveObserver(this);
-  gl_helper_->WaitSyncPoint(mailbox_holder_.sync_point);
+  gl_helper_->WaitSyncToken(mailbox_holder_.sync_token);
   gl_helper_->DeleteTexture(texture_id_);
   texture_id_ = 0;
   mailbox_holder_ = gpu::MailboxHolder();