Revert of Move NumberOfPlanesForGpuMemoryBufferFormat to gfx

content/child/child_thread_impl_browsertest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/discardable_memory.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "content/child/child_discardable_shared_memory_manager.h"
 #include "content/child/child_gpu_memory_buffer_manager.h"
 #include "content/child/child_thread_impl.h"
 #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
 #include "content/common/host_discardable_shared_memory_manager.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
-#include "ui/gfx/buffer_format_util.h"
 #include "url/gurl.h"
 
 namespace content {
 namespace {
 
 class ChildThreadImplBrowserTest : public ContentBrowserTest {
  public:
   ChildThreadImplBrowserTest()
       : child_gpu_memory_buffer_manager_(nullptr),
         child_discardable_shared_memory_manager_(nullptr) {}
@@ skipping 121 matching lines @@
                        DISABLED_Map) {
   gfx::BufferFormat format = ::testing::get<1>(GetParam());
   gfx::Size buffer_size(4, 4);
 
   scoped_ptr<gfx::GpuMemoryBuffer> buffer =
       child_gpu_memory_buffer_manager()->AllocateGpuMemoryBuffer(
           buffer_size, format, gfx::BufferUsage::MAP);
   ASSERT_TRUE(buffer);
   EXPECT_EQ(format, buffer->GetFormat());
 
-  size_t num_planes = gfx::NumberOfPlanesForBufferFormat(format);
+  size_t num_planes =
+      GpuMemoryBufferImpl::NumberOfPlanesForGpuMemoryBufferFormat(format);
 
   // Map buffer planes.
   scoped_ptr<void* []> planes(new void* [num_planes]);
   bool rv = buffer->Map(planes.get());
   ASSERT_TRUE(rv);
   EXPECT_TRUE(buffer->IsMapped());
 
   // Get strides.
   scoped_ptr<int[]> strides(new int[num_planes]);
   buffer->GetStride(strides.get());
@@ skipping 29 matching lines @@
                                          kEnableNativeBuffers),
                        // These formats are guaranteed to work on all platforms.
                        ::testing::Values(gfx::BufferFormat::R_8,
                                          gfx::BufferFormat::RGBA_4444,
                                          gfx::BufferFormat::RGBA_8888,
                                          gfx::BufferFormat::BGRA_8888,
                                          gfx::BufferFormat::YUV_420)));
 
 }  // namespace
 }  // namespace content