Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

content/renderer/media/renderer_gpu_video_accelerator_factories.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
 #define CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 50 matching lines @@
   bool CreateTextures(int32 count,
                       const gfx::Size& size,
                       std::vector<uint32>* texture_ids,
                       std::vector<gpu::Mailbox>* texture_mailboxes,
                       uint32 texture_target) override;
   void DeleteTexture(uint32 texture_id) override;
   void WaitSyncPoint(uint32 sync_point) override;
 
   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;
 
   bool IsTextureRGSupported() override;
   unsigned ImageTextureTarget() override;
   gpu::gles2::GLES2Interface* GetGLES2Interface() override;
   scoped_ptr<base::SharedMemory> CreateSharedMemory(size_t size) override;
   scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override;
 
   std::vector<media::VideoDecodeAccelerator::SupportedProfile>
       GetVideoDecodeAcceleratorSupportedProfiles() override;
   std::vector<media::VideoEncodeAccelerator::SupportedProfile>
@@ skipping 32 matching lines @@
 
   // For sending requests to allocate shared memory in the Browser process.
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererGpuVideoAcceleratorFactories);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_