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

gpu/ipc/gpu_command_buffer_traits.cc

Index: gpu/ipc/gpu_command_buffer_traits.cc
diff --git a/gpu/ipc/gpu_command_buffer_traits.cc b/gpu/ipc/gpu_command_buffer_traits.cc
index 6a77984f8e44c5ab8327143a749f31857d716cf3..aba3fc92de7544e0e735da3ecf6c65e0d7f5d98a 100644
--- a/gpu/ipc/gpu_command_buffer_traits.cc
+++ b/gpu/ipc/gpu_command_buffer_traits.cc
@@ -117,7 +117,7 @@ void ParamTraits<gpu::Mailbox>::Log(const param_type& p, std::string* l) {
 void ParamTraits<gpu::MailboxHolder>::Write(Message* m, const param_type& p) {
   WriteParam(m, p.mailbox);
   WriteParam(m, p.texture_target);
-  WriteParam(m, p.sync_point);
+  WriteParam(m, p.sync_token);
 }
 
 bool ParamTraits<gpu::MailboxHolder> ::Read(const Message* m,
@@ -125,14 +125,15 @@ bool ParamTraits<gpu::MailboxHolder> ::Read(const Message* m,
                                             param_type* p) {
   if (!ReadParam(m, iter, &p->mailbox) ||
       !ReadParam(m, iter, &p->texture_target) ||
-      !ReadParam(m, iter, &p->sync_point))
+      !ReadParam(m, iter, &p->sync_token))
     return false;
   return true;
 }
 
 void ParamTraits<gpu::MailboxHolder>::Log(const param_type& p, std::string* l) {
   ParamTraits<gpu::Mailbox>::Log(p.mailbox, l);
-  *l += base::StringPrintf(":%04x@%d", p.texture_target, p.sync_point);
+  *l += base::StringPrintf(":%04x@", p.texture_target);
+  ParamTraits<gpu::SyncToken>::Log(p.sync_token, l);
 }
 
 void ParamTraits<gpu::ValueState>::Write(Message* m, const param_type& p) {