Add buffer_to_texture_target_map to LayerTreeSettings

cc/test/layer_tree_test.cc

Index: cc/test/layer_tree_test.cc
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index 32dfda72fb26b60707402efd6544fc908748afac..382e8870e96c74ea0292303227cfb3fd69281dcf 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -719,6 +719,15 @@ void LayerTreeTest::Timeout() {
   EndTest();
 }
 
+void LayerTreeTest::InitializeRendererSettings(
+    RendererSettings* renderer_settings) {
+  // Spend less time waiting for BeginFrame because the output is
+  // mocked out.
+  renderer_settings->refresh_rate = 200.0;
+  renderer_settings->buffer_to_texture_target_map =
+      DefaultBufferToTextureTargetMapForTesting();
+}
+
 void LayerTreeTest::RealEndTest() {
   // TODO(mithro): Make this method only end when not inside an impl frame.
   bool main_frame_will_happen =
@@ -825,12 +834,11 @@ void LayerTreeTest::RunTest(CompositorMode mode) {
 
   // Spend less time waiting for BeginFrame because the output is
   // mocked out.
-  settings_.renderer_settings.refresh_rate = 200.0;
   settings_.background_animation_rate = 200.0;
   // Disable latency recovery to make the scheduler more predictable in its
   // actions and less dependent on timings to make decisions.
   settings_.enable_latency_recovery = false;
-  settings_.renderer_settings.buffer_to_texture_target_map =
+  settings_.buffer_to_texture_target_map =
       DefaultBufferToTextureTargetMapForTesting();
   InitializeSettings(&settings_);
 
@@ -869,14 +877,15 @@ LayerTreeTest::CreateCompositorFrameSink(
     scoped_refptr<ContextProvider> compositor_context_provider,
     scoped_refptr<ContextProvider> worker_context_provider) {
   constexpr bool disable_display_vsync = false;
+  RendererSettings renderer_settings;
+  InitializeRendererSettings(&renderer_settings);

[danakj, 2017/05/25 15:27:18]

It feels a bit too easy for a patch author to forget to call this when
overriding CreateCompositorFrameSink.

What if we pass RendererSettings to CreateCompositorFrameSink instead? Then a
new test overriding it would see the settings there and it would be much harder
to not use them and get the things set by this method?

It would mean moving this call up to RequestNewCompositorFrameSink instead.

[Alex Z., 2017/05/25 17:39:15]

Done.

   bool synchronous_composite =
       !HasImplThread() &&
       !layer_tree_host()->GetSettings().single_thread_proxy_scheduler;
   return base::MakeUnique<TestCompositorFrameSink>(
       compositor_context_provider, std::move(worker_context_provider),
-      shared_bitmap_manager(), gpu_memory_buffer_manager(),
-      layer_tree_host()->GetSettings().renderer_settings, impl_task_runner_,
-      synchronous_composite, disable_display_vsync);
+      shared_bitmap_manager(), gpu_memory_buffer_manager(), renderer_settings,
+      impl_task_runner_, synchronous_composite, disable_display_vsync);
 }
 
 std::unique_ptr<OutputSurface>