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

content/common/gpu/client/gl_helper_unittest.cc

 // Copyright 2014 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.
 
 #include <stdio.h>
 #include <cmath>
 #include <string>
 #include <vector>
 
 #include <GLES2/gl2.h>
@@ skipping 1345 matching lines @@
                          ysize,
                          0,
                          GL_RGBA,
                          GL_UNSIGNED_BYTE,
                          input_pixels.getPixels());
 
     gpu::Mailbox mailbox;
     context_->genMailboxCHROMIUM(mailbox.name);
     EXPECT_FALSE(mailbox.IsZero());
     context_->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
-    uint32 sync_point = context_->insertSyncPoint();
+    gpu::SyncToken sync_token;
+    ASSERT_TRUE(context_->insertSyncPoint(sync_token.GetData()));
 
     std::string message = base::StringPrintf(
         "input size: %dx%d "
         "output size: %dx%d "
         "margin: %dx%d "
         "pattern: %d %s %s",
         xsize,
         ysize,
         output_xsize,
         output_ysize,
@@ skipping 23 matching lines @@
             gfx::Size(output_xsize, output_ysize),
             base::TimeDelta::FromSeconds(0));
     scoped_refptr<media::VideoFrame> truth_frame =
         media::VideoFrame::CreateFrame(
             media::PIXEL_FORMAT_YV12, gfx::Size(output_xsize, output_ysize),
             gfx::Rect(0, 0, output_xsize, output_ysize),
             gfx::Size(output_xsize, output_ysize),
             base::TimeDelta::FromSeconds(0));
 
     base::RunLoop run_loop;
-    yuv_reader->ReadbackYUV(mailbox,
-                            sync_point,
-                            output_frame.get(),
+    yuv_reader->ReadbackYUV(mailbox, sync_token, output_frame.get(),
                             gfx::Point(xmargin, ymargin),
                             base::Bind(&callcallback, run_loop.QuitClosure()));
     run_loop.Run();
 
     if (flip) {
       FlipSKBitmap(&input_pixels);
     }
 
     unsigned char* Y = truth_frame->visible_data(media::VideoFrame::kYPlane);
     unsigned char* U = truth_frame->visible_data(media::VideoFrame::kUPlane);
@@ skipping 560 matching lines @@
   base::TestSuite* suite = new content::ContentTestSuite(argc, argv);
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif
 
   return base::LaunchUnitTestsSerially(
     argc,
     argv,
     base::Bind(&RunHelper, base::Unretained(suite)));
 }