Fix use_image_texture_target inconsistencies

cc/test/fake_resource_provider.h

Index: cc/test/fake_resource_provider.h
diff --git a/cc/test/fake_resource_provider.h b/cc/test/fake_resource_provider.h
index f28a3db3c6cd845f5c63a6027f43985b9603252d..c60ab55fc61cc44f618dd17a9b4b02ccda617aa2 100644
--- a/cc/test/fake_resource_provider.h
+++ b/cc/test/fake_resource_provider.h
@@ -8,7 +8,9 @@
 #include <stddef.h>
 
 #include "base/memory/ptr_util.h"
+#include "cc/output/renderer_settings.h"
 #include "cc/resources/resource_provider.h"
+#include "cc/test/test_image_texture_targets_map.h"
 #include "ui/gfx/buffer_types.h"
 
 namespace cc {
@@ -20,9 +22,7 @@ class FakeResourceProvider : public ResourceProvider {
       SharedBitmapManager* shared_bitmap_manager) {
     return base::WrapUnique(new FakeResourceProvider(
         output_surface, shared_bitmap_manager, nullptr, nullptr, 0, 1, true,
-        false,
-        std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
-                              GL_TEXTURE_2D)));
+        false, TestImageTextureTargetsMap()));
   }
 
   static std::unique_ptr<FakeResourceProvider> Create(
@@ -31,21 +31,20 @@ class FakeResourceProvider : public ResourceProvider {
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
     return base::WrapUnique(new FakeResourceProvider(
         output_surface, shared_bitmap_manager, gpu_memory_buffer_manager,
-        nullptr, 0, 1, true, false,
-        std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
-                              GL_TEXTURE_2D)));
+        nullptr, 0, 1, true, false, TestImageTextureTargetsMap()));
   }
 
  private:
-  FakeResourceProvider(OutputSurface* output_surface,
-                       SharedBitmapManager* shared_bitmap_manager,
-                       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
-                       BlockingTaskRunner* blocking_main_thread_task_runner,
-                       int highp_threshold_min,
-                       size_t id_allocation_chunk_size,
-                       bool delegated_sync_points_required,
-                       bool use_gpu_memory_buffer_resources,
-                       const std::vector<unsigned>& use_image_texture_targets)
+  FakeResourceProvider(
+      OutputSurface* output_surface,
+      SharedBitmapManager* shared_bitmap_manager,
+      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+      BlockingTaskRunner* blocking_main_thread_task_runner,
+      int highp_threshold_min,
+      size_t id_allocation_chunk_size,
+      bool delegated_sync_points_required,
+      bool use_gpu_memory_buffer_resources,
+      const RendererSettings::ImageTextureTargetsMap& use_image_texture_targets)
       : ResourceProvider(output_surface->context_provider(),  // TODO(danakj):
                                                               // Remove output
                                                               // surface dep