Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

components/view_manager/gles2/command_buffer_driver.cc

 // 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.
 
 #include "components/view_manager/gles2/command_buffer_driver.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "components/view_manager/gles2/command_buffer_type_conversions.h"
@@ skipping 230 matching lines @@
                                       int32_t internal_format) {
   if (!MakeCurrent())
     return;
 
   gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager();
   if (image_manager->LookupImage(id)) {
     LOG(ERROR) << "Image already exists with same ID.";
     return;
   }
 
-  gfx::GpuMemoryBuffer::Format gpu_format =
-      static_cast<gfx::GpuMemoryBuffer::Format>(format);
+  gfx::BufferFormat gpu_format = static_cast<gfx::BufferFormat>(format);
   if (!gpu::ImageFactory::IsGpuMemoryBufferFormatSupported(
           gpu_format, decoder_->GetCapabilities())) {
     LOG(ERROR) << "Format is not supported.";
     return;
   }
 
   gfx::Size gfx_size = size.To<gfx::Size>();
   if (!gpu::ImageFactory::IsImageSizeValidForGpuMemoryBufferFormat(
       gfx_size, gpu_format)) {
     LOG(ERROR) << "Invalid image size for format.";
@@ skipping 91 matching lines @@
 
 void CommandBufferDriver::DestroyDecoder() {
   if (decoder_) {
     bool have_context = decoder_->MakeCurrent();
     decoder_->Destroy(have_context);
     decoder_.reset();
   }
 }
 
 }  // namespace gles2