Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

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"
 
 namespace content {
 namespace {
 
 const int kClientId = 1;
 
 class GpuMemoryBufferImplTest
     : public testing::TestWithParam<gfx::GpuMemoryBufferType> {
  public:
   GpuMemoryBufferImplTest() : buffer_count_(0), factory_(nullptr) {}
 
   // Overridden from testing::Test:
   void SetUp() override {
     factory_ = GpuMemoryBufferFactory::Create(GetParam());
     factory_->GetSupportedGpuMemoryBufferConfigurations(
         &supported_configurations_);
   }
   void TearDown() override { factory_.reset(); }
 
-  gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
-      gfx::GpuMemoryBufferId id,
-      const gfx::Size& size,
-      gfx::GpuMemoryBuffer::Format format,
-      gfx::GpuMemoryBuffer::Usage usage) {
+  gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
+                                                   const gfx::Size& size,
+                                                   gfx::BufferFormat format,
+                                                   gfx::BufferUsage usage) {
     ++buffer_count_;
     return factory_->CreateGpuMemoryBuffer(id, size, format, usage, kClientId,
                                            gfx::kNullPluginWindow);
   }
 
   void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, uint32 sync_point) {
     factory_->DestroyGpuMemoryBuffer(id, kClientId);
     DCHECK_GT(buffer_count_, 0);
     --buffer_count_;
   }
@@ skipping 28 matching lines @@
   }
 }
 
 TEST_P(GpuMemoryBufferImplTest, Map) {
   const int 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::GpuMemoryBuffer::MAP)
+    if (configuration.usage != gfx::BufferUsage::MAP)
       continue;
 
     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)));
     ASSERT_TRUE(buffer);
@@ skipping 42 matching lines @@
   }
 }
 
 TEST_P(GpuMemoryBufferImplTest, PersistentMap) {
   const int 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::GpuMemoryBuffer::PERSISTENT_MAP)
+    if (configuration.usage != gfx::BufferUsage::PERSISTENT_MAP)
       continue;
 
     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)));
     ASSERT_TRUE(buffer);
@@ skipping 77 matching lines @@
   return supported_types;
 }
 
 INSTANTIATE_TEST_CASE_P(
     GpuMemoryBufferImplTests,
     GpuMemoryBufferImplTest,
     ::testing::ValuesIn(GetSupportedGpuMemoryBufferTypes()));
 
 }  // namespace
 }  // namespace content