Removed OLD_SYNC_POINT sync token namespace.

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 <stdint.h>
 
 #include <sstream>
 
@@ skipping 254 matching lines @@
 
 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),
+        next_fence_sync_(1),
         clean_up_started_(false) {}
 
   void BuildTree() override {
     LayerTreeHostPerfTestJsonReader::BuildTree();
     tab_contents_ =
         static_cast<TextureLayer*>(
             layer_tree_host()->root_layer()->children()[0]->
                                              children()[0]->
                                              children()[0]->
                                              children()[0].get());
     ASSERT_TRUE(tab_contents_.get());
   }
 
   void WillCommit() override {
     if (CleanUpStarted())
       return;
     gpu::Mailbox gpu_mailbox;
     std::ostringstream name_stream;
-    name_stream << "name" << next_sync_point_;
+    name_stream << "name" << next_fence_sync_;
     gpu_mailbox.SetName(
         reinterpret_cast<const int8_t*>(name_stream.str().c_str()));
     scoped_ptr<SingleReleaseCallback> callback = SingleReleaseCallback::Create(
         base::Bind(&EmptyReleaseCallback));
-    TextureMailbox mailbox(gpu_mailbox, gpu::SyncToken(next_sync_point_),
-                           GL_TEXTURE_2D);
-    next_sync_point_++;
+
+    gpu::SyncToken next_sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, 1,
+                                   next_fence_sync_);
+    next_sync_token.SetVerifyFlush();
+    TextureMailbox mailbox(gpu_mailbox, next_sync_token, GL_TEXTURE_2D);
+    next_fence_sync_++;
 
     tab_contents_->SetTextureMailbox(mailbox, std::move(callback));
   }
 
   void DidCommit() override {
     if (CleanUpStarted())
       return;
     layer_tree_host()->SetNeedsCommit();
   }
 
   void CleanUpAndEndTest(LayerTreeHostImpl* host_impl) override {
     clean_up_started_ = true;
     MainThreadTaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&BrowserCompositorInvalidateLayerTreePerfTest::
                         CleanUpAndEndTestOnMainThread,
                    base::Unretained(this)));
   }
 
   void CleanUpAndEndTestOnMainThread() {
     tab_contents_->SetTextureMailbox(TextureMailbox(), nullptr);
     EndTest();
   }
 
   bool CleanUpStarted() override { return clean_up_started_; }
 
  private:
   scoped_refptr<TextureLayer> tab_contents_;
-  unsigned next_sync_point_;
+  uint64_t next_fence_sync_;
   bool clean_up_started_;
 };
 
 TEST_F(BrowserCompositorInvalidateLayerTreePerfTest, DenseBrowserUIThreaded) {
   measure_commit_cost_ = true;
   SetTestName("dense_layer_tree");
   ReadTestFile("dense_layer_tree");
   RunTest(CompositorMode::Threaded, false);
 }
 
 // Simulates a page with several large, transformed and animated layers.
 TEST_F(LayerTreeHostPerfTestJsonReader, HeavyPageThreaded) {
   begin_frame_driven_drawing_ = true;
   measure_commit_cost_ = true;
   SetTestName("heavy_page");
   ReadTestFile("heavy_layer_tree");
   RunTest(CompositorMode::Threaded, false);
 }
 
 }  // namespace
 }  // namespace cc