Revert "Replaced blink sync points with 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);
-    const blink::WGC3Duint64 fence_sync = context_->insertFenceSyncCHROMIUM();
-    context_->shallowFlushCHROMIUM();
-
     gpu::SyncToken sync_token;
-    ASSERT_TRUE(context_->genSyncTokenCHROMIUM(fence_sync,
-                                               sync_token.GetData()));
+    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 604 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)));
 }