Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

media/renderers/mock_gpu_video_accelerator_factories.cc

 // Copyright 2013 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 "media/renderers/mock_gpu_video_accelerator_factories.h"
 
 #include "ui/gfx/gpu_memory_buffer.h"
 
 namespace media {
 
 namespace {
 
 class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
  public:
   GpuMemoryBufferImpl(const gfx::Size& size) : size_(size) {
     bytes_.resize(size_.GetArea());
   }
 
   // Overridden from gfx::GpuMemoryBuffer:
   bool Map(void** data) override {
     data[0] = &bytes_[0];
     return true;
   }
   void Unmap() override{};
   bool IsMapped() const override {
     NOTREACHED();
     return false;
   }
-  Format GetFormat() const override { return gfx::GpuMemoryBuffer::R_8; }
+  gfx::BufferFormat GetFormat() const override {
+    return gfx::BufferFormat::R_8;
+  }
   void GetStride(int* stride) const override { stride[0] = size_.width(); }
   gfx::GpuMemoryBufferId GetId() const override {
     NOTREACHED();
     return 0;
   }
   gfx::GpuMemoryBufferHandle GetHandle() const override {
     NOTREACHED();
     return gfx::GpuMemoryBufferHandle();
   }
   ClientBuffer AsClientBuffer() override {
@@ skipping 11 matching lines @@
 
 MockGpuVideoAcceleratorFactories::~MockGpuVideoAcceleratorFactories() {}
 
 bool MockGpuVideoAcceleratorFactories::IsGpuVideoAcceleratorEnabled() {
   return true;
 }
 
 scoped_ptr<gfx::GpuMemoryBuffer>
 MockGpuVideoAcceleratorFactories::AllocateGpuMemoryBuffer(
     const gfx::Size& size,
-    gfx::GpuMemoryBuffer::Format format,
-    gfx::GpuMemoryBuffer::Usage usage) {
-  DCHECK_EQ(gfx::GpuMemoryBuffer::R_8, format);
+    gfx::BufferFormat format,
+    gfx::BufferUsage usage) {
+  DCHECK(gfx::BufferFormat::R_8 == format);
   return make_scoped_ptr<gfx::GpuMemoryBuffer>(new GpuMemoryBufferImpl(size));
 }
 
 scoped_ptr<base::SharedMemory>
 MockGpuVideoAcceleratorFactories::CreateSharedMemory(size_t size) {
   return nullptr;
 }
 
 scoped_ptr<VideoDecodeAccelerator>
 MockGpuVideoAcceleratorFactories::CreateVideoDecodeAccelerator() {
   return scoped_ptr<VideoDecodeAccelerator>(DoCreateVideoDecodeAccelerator());
 }
 
 scoped_ptr<VideoEncodeAccelerator>
 MockGpuVideoAcceleratorFactories::CreateVideoEncodeAccelerator() {
   return scoped_ptr<VideoEncodeAccelerator>(DoCreateVideoEncodeAccelerator());
 }
 
 unsigned MockGpuVideoAcceleratorFactories::ImageTextureTarget() {
   return GL_TEXTURE_2D;
 }
 
 }  // namespace media