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

cc/trees/layer_tree_host_perftest.cc

 // Copyright 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.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include <sstream>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 242 matching lines @@
   SetTestName("long_scrollable_page_threaded_impl_side");
   ReadTestFile("long_scrollable_page");
   // TODO(vollick): Remove verify_property_trees setting after
   // crbug.com/444219 is fixed.
   bool old_verify_property_trees = verify_property_trees();
   set_verify_property_trees(false);
   RunTest(true, false);
   set_verify_property_trees(old_verify_property_trees);
 }
 
-static void EmptyReleaseCallback(uint32 sync_point, bool lost_resource) {}
+static void EmptyReleaseCallback(const gpu::SyncToken& sync_token,
+                                 bool lost_resource) {}
 
 // Simulates main-thread scrolling on each frame.
 class BrowserCompositorInvalidateLayerTreePerfTest
     : public LayerTreeHostPerfTestJsonReader {
  public:
   BrowserCompositorInvalidateLayerTreePerfTest()
       : LayerTreeHostPerfTestJsonReader(),
         next_sync_point_(1),
         clean_up_started_(false) {}
 
@@ skipping 11 matching lines @@
   void WillCommit() override {
     if (CleanUpStarted())
       return;
     gpu::Mailbox gpu_mailbox;
     std::ostringstream name_stream;
     name_stream << "name" << next_sync_point_;
     gpu_mailbox.SetName(
         reinterpret_cast<const int8*>(name_stream.str().c_str()));
     scoped_ptr<SingleReleaseCallback> callback = SingleReleaseCallback::Create(
         base::Bind(&EmptyReleaseCallback));
-    TextureMailbox mailbox(gpu_mailbox, GL_TEXTURE_2D, next_sync_point_);
+    TextureMailbox mailbox(gpu_mailbox, GL_TEXTURE_2D,
+                           gpu::SyncToken(next_sync_point_));
     next_sync_point_++;
 
     tab_contents_->SetTextureMailbox(mailbox, callback.Pass());
   }
 
   void DidCommit() override {
     if (CleanUpStarted())
       return;
     layer_tree_host()->SetNeedsCommit();
   }
@@ skipping 31 matching lines @@
 TEST_F(LayerTreeHostPerfTestJsonReader, HeavyPageThreaded) {
   begin_frame_driven_drawing_ = true;
   measure_commit_cost_ = true;
   SetTestName("heavy_page");
   ReadTestFile("heavy_layer_tree");
   RunTest(true, false);
 }
 
 }  // namespace
 }  // namespace cc