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

content/test/gpu_memory_buffer_factory_test_template.h

Index: content/test/gpu_memory_buffer_factory_test_template.h
diff --git a/content/test/gpu_memory_buffer_factory_test_template.h b/content/test/gpu_memory_buffer_factory_test_template.h
index 4d1ce4c14e60cf63aeef6d37e69c297ed2d3bb1f..b0b7725792fb98b7e0974b61c0bead5823a7b87a 100644
--- a/content/test/gpu_memory_buffer_factory_test_template.h
+++ b/content/test/gpu_memory_buffer_factory_test_template.h
@@ -28,7 +28,7 @@ TYPED_TEST_P(GpuMemoryBufferFactoryTest, CreateGpuMemoryBuffer) {
 
   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};
@@ -62,7 +62,7 @@ TYPED_TEST_P(GpuMemoryBufferFactoryImportTest,
 
   gfx::Size buffer_size(2, 2);
 
-  for (auto format : gfx::GetBufferFormats()) {
+  for (auto format : gfx::GetBufferFormatsForTesting()) {
     if (!TypeParam::IsGpuMemoryBufferConfigurationSupported(
             format, gfx::BufferUsage::SCANOUT)) {
       continue;