Re-enable ForceReclaimResources w/ ui impl side painting

cc/trees/layer_tree_host_impl_unittest.cc

 // Copyright 2011 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/trees/layer_tree_host_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
@@ skipping 7759 matching lines @@
   settings.gpu_rasterization_forced = true;
   EXPECT_TRUE(CreateHostImpl(settings, FakeOutputSurface::Create3d()));
 
   host_impl_->SetHasGpuRasterizationTrigger(false);
   host_impl_->SetContentIsSuitableForGpuRasterization(false);
   EXPECT_EQ(GpuRasterizationStatus::ON_FORCED,
             host_impl_->gpu_rasterization_status());
   EXPECT_TRUE(host_impl_->use_gpu_rasterization());
 }
 
+// A mock output surface which lets us detect calls to ForceReclaimResources.
+class MockReclaimResourcesOutputSurface : public FakeOutputSurface {
+ public:
+  static scoped_ptr<MockReclaimResourcesOutputSurface> Create3d() {
+    return make_scoped_ptr(new MockReclaimResourcesOutputSurface(
+        TestContextProvider::Create(), TestContextProvider::Create(), false));
+  }
+
+  MOCK_METHOD0(ForceReclaimResources, void());
+
+ protected:
+  MockReclaimResourcesOutputSurface(
+      scoped_refptr<ContextProvider> context_provider,
+      scoped_refptr<ContextProvider> worker_context_provider,
+      bool delegated_rendering)
+      : FakeOutputSurface(context_provider,
+                          worker_context_provider,
+                          delegated_rendering) {}
+};
+
+// Display::Draw (and the planned Display Scheduler) currently rely on resources
+// being reclaimed to block drawing between BeginCommit / Swap. This test
+// ensures that BeginCommit triggers ForceReclaimResources. See
+// crbug.com/489515.
+TEST_F(LayerTreeHostImplTest, BeginCommitReclaimsResources) {
+  scoped_ptr<MockReclaimResourcesOutputSurface> output_surface(
+      MockReclaimResourcesOutputSurface::Create3d());
+  EXPECT_CALL(*output_surface.get(), ForceReclaimResources()).Times(1);
+  CreateHostImpl(DefaultSettings(), output_surface.Pass());
+  host_impl_->BeginCommit();

[danakj, 2015/05/19 18:33:54]

can you verifyexpectations before this so we know where the call comes from?

[ericrk, 2015/05/19 18:38:08]

Done.

+}
+
 }  // namespace
 }  // namespace cc