Reland: GpuMemoryBuffer interface change: Map(**) to Map() and memory(plane); stride(plane)

content/test/gpu_memory_buffer_factory_test_template.h

 // 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.
 
 // This file defines tests that implementations of GpuMemoryBufferFactory should
 // pass in order to be conformant.
 
 #ifndef CONTENT_TEST_GPU_MEMORY_BUFFER_FACTORY_TEST_TEMPLATE_H_
 #define CONTENT_TEST_GPU_MEMORY_BUFFER_FACTORY_TEST_TEMPLATE_H_
 
@@ skipping 10 matching lines @@
 };
 
 TYPED_TEST_CASE_P(GpuMemoryBufferFactoryTest);
 
 TYPED_TEST_P(GpuMemoryBufferFactoryTest, CreateGpuMemoryBuffer) {
   const gfx::GpuMemoryBufferId kBufferId(1);
   const int kClientId = 1;
 
   gfx::Size buffer_size(2, 2);
 
-  for (auto format : gfx::GetBufferFormats()) {
+  for (auto format : gfx::GetBufferFormatsForTesting()) {
     gfx::BufferUsage usages[] = {gfx::BufferUsage::MAP,
                                  gfx::BufferUsage::PERSISTENT_MAP,
                                  gfx::BufferUsage::SCANOUT};
     for (auto usage : usages) {
       if (!TypeParam::IsGpuMemoryBufferConfigurationSupported(format, usage))
         continue;
 
       gfx::GpuMemoryBufferHandle handle =
           TestFixture::factory_.CreateGpuMemoryBuffer(kBufferId, buffer_size,
                                                       format, usage, kClientId,
@@ skipping 13 matching lines @@
     : public GpuMemoryBufferFactoryTest<GpuMemoryBufferFactoryType> {};
 
 TYPED_TEST_CASE_P(GpuMemoryBufferFactoryImportTest);
 
 TYPED_TEST_P(GpuMemoryBufferFactoryImportTest,
              CreateGpuMemoryBufferFromHandle) {
   const int kClientId = 1;
 
   gfx::Size buffer_size(2, 2);
 
-  for (auto format : gfx::GetBufferFormats()) {
+  for (auto format : gfx::GetBufferFormatsForTesting()) {
     if (!TypeParam::IsGpuMemoryBufferConfigurationSupported(
             format, gfx::BufferUsage::SCANOUT)) {
       continue;
     }
 
     const gfx::GpuMemoryBufferId kBufferId1(1);
     gfx::GpuMemoryBufferHandle handle1 =
         TestFixture::factory_.CreateGpuMemoryBuffer(
             kBufferId1, buffer_size, format, gfx::BufferUsage::SCANOUT,
             kClientId, gfx::kNullPluginWindow);
@@ skipping 12 matching lines @@
 }
 
 // The GpuMemoryBufferFactoryImportTest test case verifies that the
 // GpuMemoryBufferFactory implementation handles import of buffers correctly.
 REGISTER_TYPED_TEST_CASE_P(GpuMemoryBufferFactoryImportTest,
                            CreateGpuMemoryBufferFromHandle);
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_GPU_MEMORY_BUFFER_FACTORY_TEST_TEMPLATE_H_