Introducing gpu::CommandBufferId as a distinct, IdType<...>-based type.

media/video/gpu_memory_buffer_video_frame_pool_unittest.cc

 // Copyright 2015 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 <stdint.h>
 
 #include "base/bind.h"
 #include "base/test/test_simple_task_runner.h"
 #include "gpu/command_buffer/client/gles2_interface_stub.h"
 #include "media/base/video_frame.h"
@@ skipping 18 matching lines @@
 
   void OrderingBarrierCHROMIUM() override {
     flushed_fence_sync_ = next_fence_sync_ - 1;
   }
 
   GLuint64 InsertFenceSyncCHROMIUM() override { return next_fence_sync_++; }
 
   void GenSyncTokenCHROMIUM(GLuint64 fence_sync, GLbyte* sync_token) override {
     gpu::SyncToken sync_token_data;
     if (fence_sync <= flushed_fence_sync_) {
-      sync_token_data.Set(gpu::CommandBufferNamespace::GPU_IO, 0, 0,
-                          fence_sync);
+      sync_token_data.Set(gpu::CommandBufferNamespace::GPU_IO, 0,
+                          gpu::CommandBufferId(), fence_sync);
       sync_token_data.SetVerifyFlush();
     }
     memcpy(sync_token, &sync_token_data, sizeof(sync_token_data));
   }
 
   void GenUnverifiedSyncTokenCHROMIUM(GLuint64 fence_sync,
                                       GLbyte* sync_token) override {
     gpu::SyncToken sync_token_data;
     if (fence_sync <= flushed_fence_sync_) {
-      sync_token_data.Set(gpu::CommandBufferNamespace::GPU_IO, 0, 0,
-                          fence_sync);
+      sync_token_data.Set(gpu::CommandBufferNamespace::GPU_IO, 0,
+                          gpu::CommandBufferId(), fence_sync);
     }
     memcpy(sync_token, &sync_token_data, sizeof(sync_token_data));
   }
 
   void GenMailboxCHROMIUM(GLbyte* mailbox) override {
     *reinterpret_cast<unsigned*>(mailbox) = ++mailbox_;
   }
 
  private:
   uint64_t next_fence_sync_ = 1u;
@@ skipping 231 matching lines @@
   gpu_memory_buffer_pool_->MaybeCreateHardwareFrame(
       software_frame, base::Bind(MaybeCreateHardwareFrameCallback, &frame));
 
   RunUntilIdle();
 
   EXPECT_NE(software_frame.get(), frame.get());
   EXPECT_EQ(3u, gles2_->gen_textures);
 }
 
 }  // namespace media