Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc

Index: content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
index 4e61fab9218a60cef2e814b9cdd241ee54617caf..c10677188768676557cdacde745bf845e9aec1ee 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
@@ -64,7 +64,9 @@ class VideoCaptureBufferPoolTest
       mapped_ = false;
     }
     bool IsMapped() const override { return mapped_; }
-    Format GetFormat() const override { return BGRA_8888; }
+    gfx::BufferFormat GetFormat() const override {
+      return gfx::BufferFormat::BGRA_8888;
+    }
     void GetStride(int* stride) const override {
       *stride = size_.width() * 4;
       return;
@@ -91,8 +93,8 @@ class VideoCaptureBufferPoolTest
 
     scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
         const gfx::Size& size,
-        gfx::GpuMemoryBuffer::Format format,
-        gfx::GpuMemoryBuffer::Usage usage) override {
+        gfx::BufferFormat format,
+        gfx::BufferUsage usage) override {
       return make_scoped_ptr(new MockGpuMemoryBuffer(size));
     }
   };