Add GenericSharedMemoryId and use w/ GpuMemoryBuffer

content/common/gpu/client/gpu_memory_buffer_impl_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 "content/common/gpu/client/gpu_memory_buffer_impl.h"
 
 #include "base/bind.h"
 #include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/buffer_format_util.h"
@@ skipping 32 matching lines @@
   }
 
   std::vector<GpuMemoryBufferFactory::Configuration> supported_configurations_;
   int buffer_count_;
 
  private:
   scoped_ptr<GpuMemoryBufferFactory> factory_;
 };
 
 TEST_P(GpuMemoryBufferImplTest, CreateFromHandle) {
-  const int kBufferId = 1;
+  const gfx::GpuMemoryBufferId kBufferId(1);
 
   gfx::Size buffer_size(8, 8);
 
   for (auto configuration : supported_configurations_) {
     scoped_ptr<GpuMemoryBufferImpl> buffer(
         GpuMemoryBufferImpl::CreateFromHandle(
             CreateGpuMemoryBuffer(kBufferId, buffer_size, configuration.format,
                                   configuration.usage),
             buffer_size, configuration.format, configuration.usage,
             base::Bind(&GpuMemoryBufferImplTest::DestroyGpuMemoryBuffer,
                        base::Unretained(this), kBufferId)));
     EXPECT_EQ(1, buffer_count_);
     ASSERT_TRUE(buffer);
     EXPECT_EQ(buffer->GetFormat(), configuration.format);
 
     // Check if destruction callback is executed when deleting the buffer.
     buffer.reset();
     EXPECT_EQ(0, buffer_count_);
   }
 }
 
 TEST_P(GpuMemoryBufferImplTest, Map) {
-  const int kBufferId = 1;
+  const gfx::GpuMemoryBufferId kBufferId(1);
 
   // Use a multiple of 4 for both dimensions to support compressed formats.
   gfx::Size buffer_size(4, 4);
 
   for (auto configuration : supported_configurations_) {
     if (configuration.usage != gfx::BufferUsage::MAP)
       continue;
 
     scoped_ptr<GpuMemoryBufferImpl> buffer(
         GpuMemoryBufferImpl::CreateFromHandle(
@@ skipping 41 matching lines @@
                   0);
       }
     }
 
     buffer->Unmap();
     EXPECT_FALSE(buffer->IsMapped());
   }
 }
 
 TEST_P(GpuMemoryBufferImplTest, PersistentMap) {
-  const int kBufferId = 1;
+  const gfx::GpuMemoryBufferId kBufferId(1);
 
   // Use a multiple of 4 for both dimensions to support compressed formats.
   gfx::Size buffer_size(4, 4);
 
   for (auto configuration : supported_configurations_) {
     if (configuration.usage != gfx::BufferUsage::PERSISTENT_MAP)
       continue;
 
     scoped_ptr<GpuMemoryBufferImpl> buffer(
         GpuMemoryBufferImpl::CreateFromHandle(
@@ skipping 82 matching lines @@
   return supported_types;
 }
 
 INSTANTIATE_TEST_CASE_P(
     GpuMemoryBufferImplTests,
     GpuMemoryBufferImplTest,
     ::testing::ValuesIn(GetSupportedGpuMemoryBufferTypes()));
 
 }  // namespace
 }  // namespace content