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

content/common/gpu/client/gpu_context_tests.h

 // Copyright 2013 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.
 
 // These tests are run twice:
 // Once in a gpu test with an in-process WebGraphicsContext3D.
 // Once in a browsertest with a gpu-process WebGraphicsContext3D.
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/context_support.h"
+#include "gpu/command_buffer/common/sync_token.h"
 
 namespace {
 
 class SignalTest : public ContextTestBase {
  public:
   static void RunOnlyOnce(base::Closure cb, int* tmp) {
     CHECK_EQ(*tmp, 0);
     ++*tmp;
     cb.Run();
   }
@@ skipping 13 matching lines @@
         base::Bind(
             &RunOnlyOnce, run_loop.QuitClosure(), base::Owned(new int(0))));
     run_loop.Run();
   }
 };
 
 CONTEXT_TEST_F(SignalTest, BasicSignalSyncPointTest) {
   if (!context_)
     return;
 
-  TestSignalSyncPoint(context_->insertSyncPoint());
+  gpu::SyncToken sync_token;
+  ASSERT_TRUE(context_->insertSyncPoint(sync_token.GetData()));
+  TestSignalSyncPoint(static_cast<unsigned>(sync_token.release_count()));
 };
 
 CONTEXT_TEST_F(SignalTest, InvalidSignalSyncPointTest) {
   if (!context_)
     return;
 
   // Signalling something that doesn't exist should run the callback
   // immediately.
   TestSignalSyncPoint(1297824234);
 };
@@ skipping 27 matching lines @@
   // immediately.
   TestSignalQuery(928729087);
   TestSignalQuery(928729086);
   TestSignalQuery(928729085);
   TestSignalQuery(928729083);
   TestSignalQuery(928729082);
   TestSignalQuery(928729081);
 };
 
 };