Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

mandoline/ui/aura/surface_context_factory.cc

 // Copyright 2015 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 "mandoline/ui/aura/surface_context_factory.h"
 
 #include "cc/output/output_surface.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "components/view_manager/public/cpp/view.h"
@@ skipping 48 matching lines @@
 }
 
 void SurfaceContextFactory::RemoveCompositor(ui::Compositor* compositor) {
   NOTIMPLEMENTED();
 }
 
 bool SurfaceContextFactory::DoesCreateTestContexts() {
   return false;
 }
 
-uint32 SurfaceContextFactory::GetImageTextureTarget(
-    gfx::GpuMemoryBuffer::Format format,
-    gfx::GpuMemoryBuffer::Usage usage) {
+uint32 SurfaceContextFactory::GetImageTextureTarget(gfx::BufferFormat format,
+                                                    gfx::BufferUsage usage) {
   // No GpuMemoryBuffer support, so just return GL_TEXTURE_2D.
   return GL_TEXTURE_2D;
 }
 
 cc::SharedBitmapManager* SurfaceContextFactory::GetSharedBitmapManager() {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 gpu::GpuMemoryBufferManager*
@@ skipping 10 matching lines @@
   return make_scoped_ptr(
       new cc::SurfaceIdAllocator(next_surface_id_namespace_++));
 }
 
 void SurfaceContextFactory::ResizeDisplay(ui::Compositor* compositor,
                                           const gfx::Size& size) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace mandoline