Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

content/browser/renderer_host/media/video_capture_buffer_pool.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.
 
 #include "content/browser/renderer_host/media/video_capture_buffer_pool.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
@@ skipping 163 matching lines @@
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(BrowserGpuMemoryBufferManager::current());
   set_pixel_format(format);
   set_storage_type(storage_type);
   set_pixel_count(dimensions.GetArea());
   // |dimensions| can be 0x0 for trackers that do not require memory backing.
   if (dimensions.GetArea() == 0u)
     return true;
   gpu_memory_buffer_ =
       BrowserGpuMemoryBufferManager::current()->AllocateGpuMemoryBuffer(
-          dimensions,
-          gfx::GpuMemoryBuffer::BGRA_8888,
-          gfx::GpuMemoryBuffer::MAP);
+          dimensions, gfx::BufferFormat::BGRA_8888, gfx::BufferUsage::MAP);
   DLOG_IF(ERROR, !gpu_memory_buffer_.get()) << "Allocating GpuMemoryBuffer";
   if (!gpu_memory_buffer_.get())
     return false;
   int plane_sizes;
   gpu_memory_buffer_->GetStride(&plane_sizes);
   packed_size_ = plane_sizes * dimensions.height();
   return true;
 }
 
 // static
@@ skipping 174 matching lines @@
   return buffer_id;
 }
 
 VideoCaptureBufferPool::Tracker* VideoCaptureBufferPool::GetTracker(
     int buffer_id) {
   TrackerMap::const_iterator it = trackers_.find(buffer_id);
   return (it == trackers_.end()) ? NULL : it->second;
 }
 
 }  // namespace content