Revert of Move NumberOfPlanesForGpuMemoryBufferFormat to gfx

content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc

Index: content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc b/content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc
index 1ab1d99d4b9e168e134e381705fd24104444fa76..d96c7f43409d5ae8ef88077f8dec6b823705375d 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc
@@ -7,7 +7,6 @@
 #include "base/bind.h"
 #include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/buffer_format_util.h"
 
 namespace content {
 namespace {
@@ -93,7 +92,8 @@
     EXPECT_FALSE(buffer->IsMapped());
 
     size_t num_planes =
-        gfx::NumberOfPlanesForBufferFormat(configuration.format);
+        GpuMemoryBufferImpl::NumberOfPlanesForGpuMemoryBufferFormat(
+            configuration.format);
 
     // Map buffer into user space.
     scoped_ptr<void*[]> mapped_buffers(new void*[num_planes]);
@@ -155,7 +155,8 @@
     EXPECT_FALSE(buffer->IsMapped());
 
     size_t num_planes =
-        gfx::NumberOfPlanesForBufferFormat(configuration.format);
+        GpuMemoryBufferImpl::NumberOfPlanesForGpuMemoryBufferFormat(
+            configuration.format);
 
     // Map buffer into user space.
     scoped_ptr<void* []> mapped_buffers(new void* [num_planes]);