Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

content/child/child_thread_impl_browsertest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/discardable_memory.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "content/child/child_discardable_shared_memory_manager.h"
@@ skipping 111 matching lines @@
   }
 
   EXPECT_LT(base::TimeTicks::Now(), end);
 }
 
 enum NativeBufferFlag { kDisableNativeBuffers, kEnableNativeBuffers };
 
 class ChildThreadImplGpuMemoryBufferBrowserTest
     : public ChildThreadImplBrowserTest,
       public testing::WithParamInterface<
-          ::testing::tuple<NativeBufferFlag, gfx::GpuMemoryBuffer::Format>> {
+          ::testing::tuple<NativeBufferFlag, gfx::BufferFormat>> {
  public:
   // Overridden from BrowserTestBase:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ChildThreadImplBrowserTest::SetUpCommandLine(command_line);
     NativeBufferFlag native_buffer_flag = ::testing::get<0>(GetParam());
     switch (native_buffer_flag) {
       case kEnableNativeBuffers:
         command_line->AppendSwitch(switches::kEnableNativeGpuMemoryBuffers);
         break;
       case kDisableNativeBuffers:
         break;
     }
   }
 };
 
 IN_PROC_BROWSER_TEST_P(ChildThreadImplGpuMemoryBufferBrowserTest,
                        DISABLED_Map) {
-  gfx::GpuMemoryBuffer::Format format = ::testing::get<1>(GetParam());
+  gfx::BufferFormat format = ::testing::get<1>(GetParam());
   gfx::Size buffer_size(4, 4);
 
   scoped_ptr<gfx::GpuMemoryBuffer> buffer =
       child_gpu_memory_buffer_manager()->AllocateGpuMemoryBuffer(
-          buffer_size, format, gfx::GpuMemoryBuffer::MAP);
+          buffer_size, format, gfx::BufferUsage::MAP);
   ASSERT_TRUE(buffer);
   EXPECT_EQ(format, buffer->GetFormat());
 
   size_t num_planes =
       GpuMemoryBufferImpl::NumberOfPlanesForGpuMemoryBufferFormat(format);
 
   // Map buffer planes.
   scoped_ptr<void* []> planes(new void* [num_planes]);
   bool rv = buffer->Map(planes.get());
   ASSERT_TRUE(rv);
@@ skipping 26 matching lines @@
   buffer->Unmap();
   EXPECT_FALSE(buffer->IsMapped());
 }
 
 INSTANTIATE_TEST_CASE_P(
     ChildThreadImplGpuMemoryBufferBrowserTests,
     ChildThreadImplGpuMemoryBufferBrowserTest,
     ::testing::Combine(::testing::Values(kDisableNativeBuffers,
                                          kEnableNativeBuffers),
                        // These formats are guaranteed to work on all platforms.
-                       ::testing::Values(gfx::GpuMemoryBuffer::R_8,
-                                         gfx::GpuMemoryBuffer::RGBA_4444,
-                                         gfx::GpuMemoryBuffer::RGBA_8888,
-                                         gfx::GpuMemoryBuffer::BGRA_8888,
-                                         gfx::GpuMemoryBuffer::YUV_420)));
+                       ::testing::Values(gfx::BufferFormat::R_8,
+                                         gfx::BufferFormat::RGBA_4444,
+                                         gfx::BufferFormat::RGBA_8888,
+                                         gfx::BufferFormat::BGRA_8888,
+                                         gfx::BufferFormat::YUV_420)));
 
 }  // namespace
 }  // namespace content