Remove the default format from ResourcePool.

cc/test/layer_tree_pixel_resource_test.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 "cc/test/layer_tree_pixel_resource_test.h"
 
 #include "cc/layers/layer.h"
 #include "cc/resources/bitmap_tile_task_worker_pool.h"
 #include "cc/resources/gpu_rasterizer.h"
 #include "cc/resources/gpu_tile_task_worker_pool.h"
@@ skipping 128 matching lines @@
       return SoftwareRasterizer::Create();
     case GPU_TILE_TASK_WORKER_POOL:
       EXPECT_TRUE(context_provider);
       return GpuRasterizer::Create(context_provider, resource_provider,
                                    use_distance_field_text, false);
   }
   NOTREACHED();
   return nullptr;
 }
 
-void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
+ResourceFormat
+LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
     LayerTreeHostImpl* host_impl,
     scoped_ptr<TileTaskWorkerPool>* tile_task_worker_pool,
     scoped_ptr<ResourcePool>* resource_pool,
     scoped_ptr<ResourcePool>* staging_resource_pool) {
   base::SingleThreadTaskRunner* task_runner =
       proxy()->HasImplThread() ? proxy()->ImplThreadTaskRunner()
                                : proxy()->MainThreadTaskRunner();
   DCHECK(task_runner);
   DCHECK(initialized_);
 
   ContextProvider* context_provider =
       host_impl->output_surface()->context_provider();
   ResourceProvider* resource_provider = host_impl->resource_provider();
   size_t max_transfer_buffer_usage_bytes = 1024u * 1024u * 60u;
 
+  ResourceFormat resource_format = resource_provider->best_texture_format();
+
   switch (resource_pool_option_) {
     case BITMAP_TILE_TASK_WORKER_POOL:
       EXPECT_FALSE(context_provider);
       EXPECT_EQ(PIXEL_TEST_SOFTWARE, test_type_);
       *resource_pool =
           ResourcePool::Create(resource_provider,
-                               draw_texture_target_,
-                               resource_provider->best_texture_format());
+                               draw_texture_target_);
 
       *tile_task_worker_pool = BitmapTileTaskWorkerPool::Create(
           task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
           resource_provider);
       break;
     case GPU_TILE_TASK_WORKER_POOL:
       EXPECT_TRUE(context_provider);
       EXPECT_EQ(PIXEL_TEST_GL, test_type_);
       *resource_pool =
           ResourcePool::Create(resource_provider,
-                               draw_texture_target_,
-                               resource_provider->best_texture_format());
+                               draw_texture_target_);
 
       *tile_task_worker_pool = GpuTileTaskWorkerPool::Create(
           task_runner, TileTaskWorkerPool::GetTaskGraphRunner());
       break;
     case ZERO_COPY_TILE_TASK_WORKER_POOL:
       EXPECT_TRUE(context_provider);
       EXPECT_EQ(PIXEL_TEST_GL, test_type_);
       EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image);
       *resource_pool =
-          ResourcePool::Create(resource_provider,
-                               draw_texture_target_,
-                               resource_provider->best_texture_format());
+          ResourcePool::Create(resource_provider, draw_texture_target_);
 
       *tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create(
           task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
           resource_provider);
       break;
     case ONE_COPY_TILE_TASK_WORKER_POOL:
       EXPECT_TRUE(context_provider);
       EXPECT_EQ(PIXEL_TEST_GL, test_type_);
       EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image);
       // We need to create a staging resource pool when using copy rasterizer.
       *staging_resource_pool =
-          ResourcePool::Create(resource_provider,
-                               staging_texture_target_,
-                               resource_provider->best_texture_format());
+          ResourcePool::Create(resource_provider, staging_texture_target_);
       *resource_pool =
-          ResourcePool::Create(resource_provider,
-                               draw_texture_target_,
-                               resource_provider->best_texture_format());
+          ResourcePool::Create(resource_provider, draw_texture_target_);
 
       *tile_task_worker_pool = OneCopyTileTaskWorkerPool::Create(
           task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
-          context_provider, resource_provider, staging_resource_pool->get());
+          context_provider, resource_provider, staging_resource_pool->get(),
+          resource_format);
       break;
     case PIXEL_BUFFER_TILE_TASK_WORKER_POOL:
       EXPECT_TRUE(context_provider);
       EXPECT_EQ(PIXEL_TEST_GL, test_type_);
+      resource_format = resource_provider->memory_efficient_texture_format();
       *resource_pool = ResourcePool::Create(
-          resource_provider,
-          draw_texture_target_,
-          resource_provider->memory_efficient_texture_format());
+          resource_provider, draw_texture_target_);
 
       *tile_task_worker_pool = PixelBufferTileTaskWorkerPool::Create(
           task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
           context_provider, resource_provider, max_transfer_buffer_usage_bytes);
       break;
   }
+
+  return resource_format;
 }
 
 void LayerTreeHostPixelResourceTest::RunPixelResourceTest(
     scoped_refptr<Layer> content_root,
     base::FilePath file_name) {
   if (!IsTestCaseSupported(test_case_))
     return;
   RunPixelTest(test_type_, content_root, file_name);
 
   if (layer_tree_host())
     EXPECT_TRUE(layer_tree_host()->settings().impl_side_painting);
 }
 
 ParameterizedPixelResourceTest::ParameterizedPixelResourceTest()
     : LayerTreeHostPixelResourceTest(GetParam()) {
 }
 
 }  // namespace cc