cc: Fix the format of GpuMemoryBuffer for SurfaceTexture

cc/resources/resource_provider.cc

Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index 4c7c9dae8aedbca3ac221362f45a60ad9f90daa3..3d0c30e5e1a6e848a4aacbefba2f804f7d3c7f04 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -29,7 +29,6 @@
 #include "third_party/skia/include/gpu/GrTextureProvider.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/vector2d.h"
-#include "ui/gfx/gpu_memory_buffer.h"
 
 using gpu::gles2::GLES2Interface;
 
@@ -113,25 +112,6 @@ GrPixelConfig ToGrPixelConfig(ResourceFormat format) {
   return kSkia8888_GrPixelConfig;
 }
 
-gfx::GpuMemoryBuffer::Format ToGpuMemoryBufferFormat(ResourceFormat format) {
-  switch (format) {
-    case RGBA_8888:
-      return gfx::GpuMemoryBuffer::RGBA_8888;
-    case BGRA_8888:
-      return gfx::GpuMemoryBuffer::BGRA_8888;
-    case RGBA_4444:
-      return gfx::GpuMemoryBuffer::RGBA_4444;
-    case ALPHA_8:
-    case LUMINANCE_8:
-    case RGB_565:
-    case ETC1:
-    case RED_8:
-      break;
-  }
-  NOTREACHED();
-  return gfx::GpuMemoryBuffer::RGBA_8888;
-}
-
 class ScopedSetActiveTexture {
  public:
   ScopedSetActiveTexture(GLES2Interface* gl, GLenum unit)
@@ -430,6 +410,26 @@ ResourceProvider::~ResourceProvider() {
   gl->Finish();
 }
 
+gfx::GpuMemoryBuffer::Format ResourceProvider::ToGpuMemoryBufferFormat(
+    ResourceFormat format) {
+  switch (format) {
+    case RGBA_8888:
+      return gfx::GpuMemoryBuffer::RGBA_8888;
+    case BGRA_8888:
+      return gfx::GpuMemoryBuffer::BGRA_8888;
+    case RGBA_4444:
+      return gfx::GpuMemoryBuffer::RGBA_4444;
+    case ALPHA_8:
+    case LUMINANCE_8:
+    case RGB_565:
+    case ETC1:
+    case RED_8:
+      break;
+  }
+  NOTREACHED();
+  return gfx::GpuMemoryBuffer::RGBA_8888;
+}
+
 bool ResourceProvider::InUseByConsumer(ResourceId id) {
   Resource* resource = GetResource(id);
   return resource->lock_for_read_count > 0 || resource->exported_count > 0 ||