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

ui/aura/bench/bench_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 125 matching lines @@
   TimeTicks start_time_;
   int frames_;
   int max_frames_;
 
   DISALLOW_COPY_AND_ASSIGN(BenchCompositorObserver);
 };
 
 void ReturnMailbox(scoped_refptr<cc::ContextProvider> context_provider,
                    GLuint texture,
                    GLuint sync_point,
+                   const gpu::SyncToken& sync_token,
                    bool is_lost) {
   gpu::gles2::GLES2Interface* gl = context_provider->ContextGL();
-  gl->WaitSyncPointCHROMIUM(sync_point);
+  gl->WaitSyncPointCHROMIUM(sync_point, sync_token.GetConstData());
   gl->DeleteTextures(1, &texture);
   gl->ShallowFlushCHROMIUM();
 }
 
 gfx::Size GetFullscreenSize() {
 #if defined(OS_WIN)
   return gfx::Size(GetSystemMetrics(SM_CXSCREEN),
                    GetSystemMetrics(SM_CYSCREEN));
 #else
   NOTIMPLEMENTED();
@@ skipping 216 matching lines @@
   ui::PrintLayerHierarchy(host->window()->layer(), gfx::Point(100, 100));
 #endif
 
   host->Show();
   base::MessageLoopForUI::current()->Run();
   focus_client.reset();
   host.reset();
 
   return 0;
 }