Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc

 // Copyright (c) 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.
 
 // Unit test for VideoCaptureBufferPool.
 
 #include "content/browser/renderer_host/media/video_capture_buffer_pool.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
@@ skipping 46 matching lines @@
       EXPECT_EQ(mapped_, false);
       mapped_ = true;
       data[0] = static_cast<void*>(data_);
       return true;
     }
     void Unmap() override {
       EXPECT_EQ(mapped_, true);
       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;
     }
     gfx::GpuMemoryBufferId GetId() const override { return 0; }
     gfx::GpuMemoryBufferHandle GetHandle() const override {
       return gfx::GpuMemoryBufferHandle();
     }
     ClientBuffer AsClientBuffer() override { return nullptr; }
 
    private:
     const gfx::Size size_;
     uint8* const data_;
     bool mapped_;
   };
 
 #if !defined(OS_ANDROID)
   // The next two classes are needed to replicate the GpuMemoryBuffer allocation
   // on Browser side.
   class StubBrowserGpuMemoryBufferManager
       : public BrowserGpuMemoryBufferManager {
    public:
     StubBrowserGpuMemoryBufferManager() : BrowserGpuMemoryBufferManager(1) {}
 
     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));
     }
   };
   class MockBufferQueue : public BufferQueue {
    public:
     MockBufferQueue(scoped_refptr<cc::ContextProvider> context_provider,
                     BrowserGpuMemoryBufferManager* gpu_memory_buffer_manager,
                     unsigned int target,
                     unsigned int internalformat)
         : BufferQueue(context_provider,
@@ skipping 248 matching lines @@
   if (buffer4->data() != nullptr)
     memset(buffer4->data(), 0x77, buffer4->size());
   buffer4.reset();
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         VideoCaptureBufferPoolTest,
                         testing::ValuesIn(kCapturePixelFormatAndStorages));
 
 } // namespace content