Remove ForceReclaimResources

cc/layers/texture_layer_unittest.cc

Index: cc/layers/texture_layer_unittest.cc
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc
index 7d10bf7ee4ae7739693a0d58c5afe75ac8d6d3fe..bb3207c91608ed7d0c0cdfc0d59e7539c334ab91 100644
--- a/cc/layers/texture_layer_unittest.cc
+++ b/cc/layers/texture_layer_unittest.cc
@@ -643,15 +643,16 @@ class TextureLayerImplWithMailboxThreadedCallback : public LayerTreeTest {
     bool synchronous_composite =
         !HasImplThread() &&
         !layer_tree_host()->GetSettings().single_thread_proxy_scheduler;
-    // Allow relaim resources for this test so that mailboxes in the display
-    // will be returned inside the commit that replaces them.
-    bool force_disable_reclaim_resources = false;
-    return base::MakeUnique<TestCompositorFrameSink>(
+    auto sink = base::MakeUnique<TestCompositorFrameSink>(
         compositor_context_provider, std::move(worker_context_provider),
         shared_bitmap_manager(), gpu_memory_buffer_manager(),
         layer_tree_host()->GetSettings().renderer_settings,
-        ImplThreadTaskRunner(), synchronous_composite,
-        force_disable_reclaim_resources);
+        ImplThreadTaskRunner(), synchronous_composite);
+
+    // Ensure that resources are immediately returned after swap and release
+    // callbacks are triggered.
+    sink->SetForceReclaimResourcesAfterSwap();

[ericrk, 2017/01/04 18:10:48]

This is now a test-only method which is used for this test only.

+    return sink;
   }
 
   // Make sure callback is received on main and doesn't block the impl thread.