Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

content/browser/compositor/buffer_queue_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 <set>
 
 #include "cc/test/test_context_provider.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "content/browser/compositor/buffer_queue.h"
 #include "content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h"
@@ skipping 12 matching lines @@
 namespace content {
 
 class StubGpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
  public:
   StubGpuMemoryBufferImpl() {}
 
   // Overridden from gfx::GpuMemoryBuffer:
   bool Map(void** data) override { return false; }
   void Unmap() override {}
   bool IsMapped() const override { return false; }
-  Format GetFormat() const override { return gfx::GpuMemoryBuffer::RGBX_8888; }
+  gfx::BufferFormat GetFormat() const override {
+    return gfx::BufferFormat::RGBX_8888;
+  }
   void GetStride(int* stride) const override {}
   gfx::GpuMemoryBufferId GetId() const override { return 0; }
   gfx::GpuMemoryBufferHandle GetHandle() const override {
     return gfx::GpuMemoryBufferHandle();
   }
   ClientBuffer AsClientBuffer() override {
     return reinterpret_cast<ClientBuffer>(this);
   }
 };
 
 class StubBrowserGpuMemoryBufferManager : public BrowserGpuMemoryBufferManager {
  public:
   StubBrowserGpuMemoryBufferManager() : BrowserGpuMemoryBufferManager(1) {}
 
   scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForScanout(
       const gfx::Size& size,
-      gfx::GpuMemoryBuffer::Format format,
+      gfx::BufferFormat format,
       int32 surface_id) override {
     return make_scoped_ptr<gfx::GpuMemoryBuffer>(new StubGpuMemoryBufferImpl);
   }
 };
 
 class MockBufferQueue : public BufferQueue {
  public:
   MockBufferQueue(scoped_refptr<cc::ContextProvider> context_provider,
                   BrowserGpuMemoryBufferManager* gpu_memory_buffer_manager,
                   unsigned int target,
@@ skipping 485 matching lines @@
   // All free buffers should be destroyed, the remaining buffers should all
   // be replaced but still valid.
   EXPECT_EQ(1U, in_flight_surfaces().size());
   EXPECT_EQ(0U, available_surfaces().size());
   EXPECT_TRUE(displayed_frame().texture);
   EXPECT_TRUE(current_frame().texture);
 }
 
 }  // namespace
 }  // namespace content