Revert of Move NumberOfPlanesForGpuMemoryBufferFormat to gfx

content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc

 // Copyright 2014 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 "content/common/gpu/client/gpu_memory_buffer_impl.h"
 
 #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 {
 
 const int kClientId = 1;
 
 class GpuMemoryBufferImplTest
     : public testing::TestWithParam<gfx::GpuMemoryBufferType> {
  public:
   GpuMemoryBufferImplTest() : buffer_count_(0), factory_(nullptr) {}
@@ skipping 65 matching lines @@
         GpuMemoryBufferImpl::CreateFromHandle(
             CreateGpuMemoryBuffer(kBufferId, buffer_size, configuration.format,
                                   configuration.usage),
             buffer_size, configuration.format, configuration.usage,
             base::Bind(&GpuMemoryBufferImplTest::DestroyGpuMemoryBuffer,
                        base::Unretained(this), kBufferId)));
     ASSERT_TRUE(buffer);
     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]);
     bool rv = buffer->Map(mapped_buffers.get());
     ASSERT_TRUE(rv);
     EXPECT_TRUE(buffer->IsMapped());
 
     // Get strides.
     scoped_ptr<int[]> strides(new int[num_planes]);
     buffer->GetStride(strides.get());
@@ skipping 41 matching lines @@
         GpuMemoryBufferImpl::CreateFromHandle(
             CreateGpuMemoryBuffer(kBufferId, buffer_size, configuration.format,
                                   configuration.usage),
             buffer_size, configuration.format, configuration.usage,
             base::Bind(&GpuMemoryBufferImplTest::DestroyGpuMemoryBuffer,
                        base::Unretained(this), kBufferId)));
     ASSERT_TRUE(buffer);
     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]);
     bool rv = buffer->Map(mapped_buffers.get());
     ASSERT_TRUE(rv);
     EXPECT_TRUE(buffer->IsMapped());
 
     // Get strides.
     scoped_ptr<int[]> strides(new int[num_planes]);
     buffer->GetStride(strides.get());
@@ skipping 62 matching lines @@
   return supported_types;
 }
 
 INSTANTIATE_TEST_CASE_P(
     GpuMemoryBufferImplTests,
     GpuMemoryBufferImplTest,
     ::testing::ValuesIn(GetSupportedGpuMemoryBufferTypes()));
 
 }  // namespace
 }  // namespace content