| Index: cc/trees/layer_tree_host_impl_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
|
| index 0dc411587d30bbd221e3951b3a7ac98a0ca93eca..f624c23a18a4b6c34c85d57de79546732422f533 100644
|
| --- a/cc/trees/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_impl_unittest.cc
|
| @@ -10601,22 +10601,12 @@ TEST_F(MsaaIsSlowLayerTreeHostImplTest, GpuRasterizationStatusMsaaIsSlow) {
|
| // A mock output surface which lets us detect calls to ForceReclaimResources.
|
| class MockReclaimResourcesOutputSurface : public FakeOutputSurface {
|
| public:
|
| - static std::unique_ptr<MockReclaimResourcesOutputSurface> Create3d() {
|
| - return base::WrapUnique(new MockReclaimResourcesOutputSurface(
|
| - TestContextProvider::Create(), TestContextProvider::CreateWorker(),
|
| - false));
|
| - }
|
| + MockReclaimResourcesOutputSurface()
|
| + : FakeOutputSurface(TestContextProvider::Create(),
|
| + TestContextProvider::CreateWorker(),
|
| + true) {}
|
|
|
| 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
|
| @@ -10624,8 +10614,7 @@ class MockReclaimResourcesOutputSurface : public FakeOutputSurface {
|
| // ensures that BeginCommit triggers ForceReclaimResources. See
|
| // crbug.com/489515.
|
| TEST_F(LayerTreeHostImplTest, BeginCommitReclaimsResources) {
|
| - std::unique_ptr<MockReclaimResourcesOutputSurface> output_surface(
|
| - MockReclaimResourcesOutputSurface::Create3d());
|
| + auto output_surface = base::MakeUnique<MockReclaimResourcesOutputSurface>();
|
| // Hold an unowned pointer to the output surface to use for mock expectations.
|
| MockReclaimResourcesOutputSurface* mock_output_surface = output_surface.get();
|
|
|
|
|