Revert of Remove SurfaceFactory::Create and SurfaceFactory::Destroy

cc/surfaces/surface_aggregator_unittest.cc

 // Copyright 2014 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/surfaces/surface_aggregator.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 16 matching lines @@
 #include "cc/test/render_pass_test_utils.h"
 #include "cc/test/surface_aggregator_test_helpers.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace cc {
 namespace {
 
-static constexpr FrameSinkId kArbitraryRootFrameSinkId(1, 1);
+static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1);
 static constexpr FrameSinkId kArbitraryChildFrameSinkId(2, 2);
-static constexpr FrameSinkId kArbitraryMiddleFrameSinkId(3, 3);
 static const base::UnguessableToken kArbitraryToken =
     base::UnguessableToken::Create();
 
 SurfaceId InvalidSurfaceId() {
-  static SurfaceId invalid(kArbitraryRootFrameSinkId,
+  static SurfaceId invalid(kArbitraryFrameSinkId,
                            LocalFrameId(0xdeadbeef, kArbitraryToken));
   return invalid;
 }
 
 gfx::Size SurfaceSize() {
   static gfx::Size size(100, 100);
   return size;
 }
 
 class EmptySurfaceFactoryClient : public SurfaceFactoryClient {
  public:
   void ReturnResources(const ReturnedResourceArray& resources) override {}
 
   void WillDrawSurface(const LocalFrameId& id,
                        const gfx::Rect& damage_rect) override {
     last_local_frame_id_ = id;
     last_damage_rect_ = damage_rect;
   }
 
   void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override {}
 
   gfx::Rect last_damage_rect_;
   LocalFrameId last_local_frame_id_;
 };
 
 class SurfaceAggregatorTest : public testing::Test {
  public:
   explicit SurfaceAggregatorTest(bool use_damage_rect)
-      : factory_(kArbitraryRootFrameSinkId, &manager_, &empty_client_),
+      : factory_(kArbitraryFrameSinkId, &manager_, &empty_client_),
         aggregator_(&manager_, NULL, use_damage_rect) {}
 
   SurfaceAggregatorTest() : SurfaceAggregatorTest(false) {}
 
-  void TearDown() override {
-    factory_.EvictSurface();
-    testing::Test::TearDown();
-  }
-
  protected:
   SurfaceManager manager_;
   EmptySurfaceFactoryClient empty_client_;
   SurfaceFactory factory_;
   SurfaceAggregator aggregator_;
 };
 
 TEST_F(SurfaceAggregatorTest, ValidSurfaceNoFrame) {
   LocalFrameId local_frame_id(7, base::UnguessableToken::Create());
-  SurfaceId one_id(kArbitraryRootFrameSinkId, local_frame_id);
-  factory_.SubmitCompositorFrame(local_frame_id, CompositorFrame(),
-                                 SurfaceFactory::DrawCallback());
+  SurfaceId one_id(kArbitraryFrameSinkId, local_frame_id);
+  factory_.Create(local_frame_id);
 
   CompositorFrame frame = aggregator_.Aggregate(one_id);
   EXPECT_TRUE(frame.render_pass_list.empty());
+
+  factory_.Destroy(local_frame_id);
 }
 
 class SurfaceAggregatorValidSurfaceTest : public SurfaceAggregatorTest {
  public:
   explicit SurfaceAggregatorValidSurfaceTest(bool use_damage_rect)
       : SurfaceAggregatorTest(use_damage_rect),
         child_factory_(kArbitraryChildFrameSinkId,
                        &manager_,
                        &empty_child_client_) {}
   SurfaceAggregatorValidSurfaceTest()
       : SurfaceAggregatorValidSurfaceTest(false) {}
 
   void SetUp() override {
     SurfaceAggregatorTest::SetUp();
     root_local_frame_id_ = allocator_.GenerateId();
+    factory_.Create(root_local_frame_id_);
     root_surface_ = manager_.GetSurfaceForId(
         SurfaceId(factory_.frame_sink_id(), root_local_frame_id_));
   }
 
   void TearDown() override {
-    child_factory_.EvictSurface();
+    factory_.Destroy(root_local_frame_id_);
     SurfaceAggregatorTest::TearDown();
   }
 
   void AggregateAndVerify(test::Pass* expected_passes,
                           size_t expected_pass_count,
                           SurfaceId* surface_ids,
                           size_t expected_surface_count) {
     CompositorFrame aggregated_frame = aggregator_.Aggregate(
         SurfaceId(factory_.frame_sink_id(), root_local_frame_id_));
 
@@ skipping 28 matching lines @@
   void SubmitCompositorFrame(SurfaceFactory* factory,
                              test::Pass* passes,
                              size_t pass_count,
                              const LocalFrameId& local_frame_id) {
     RenderPassList pass_list;
     AddPasses(&pass_list, gfx::Rect(SurfaceSize()), passes, pass_count);
     SubmitPassListAsFrame(factory, local_frame_id, &pass_list);
   }
 
   void QueuePassAsFrame(std::unique_ptr<RenderPass> pass,
-                        const LocalFrameId& local_frame_id,
-                        SurfaceFactory* factory) {
+                        const LocalFrameId& local_frame_id) {
     CompositorFrame child_frame;
     child_frame.render_pass_list.push_back(std::move(pass));
 
-    factory->SubmitCompositorFrame(local_frame_id, std::move(child_frame),
+    factory_.SubmitCompositorFrame(local_frame_id, std::move(child_frame),
                                    SurfaceFactory::DrawCallback());
   }
 
  protected:
   LocalFrameId root_local_frame_id_;
   Surface* root_surface_;
   SurfaceIdAllocator allocator_;
   EmptySurfaceFactoryClient empty_child_client_;
   SurfaceFactory child_factory_;
   SurfaceIdAllocator child_allocator_;
@@ skipping 13 matching lines @@
   SurfaceId ids[] = {root_surface_id};
 
   AggregateAndVerify(passes, arraysize(passes), ids, arraysize(ids));
 
   // Check that WillDrawSurface was called.
   EXPECT_EQ(gfx::Rect(SurfaceSize()), empty_client_.last_damage_rect_);
   EXPECT_EQ(root_local_frame_id_, empty_client_.last_local_frame_id_);
 }
 
 TEST_F(SurfaceAggregatorValidSurfaceTest, OpacityCopied) {
-  SurfaceFactory embedded_factory(kArbitraryChildFrameSinkId, &manager_,
-                                  &empty_client_);
   LocalFrameId embedded_local_frame_id = allocator_.GenerateId();
-  SurfaceId embedded_surface_id(embedded_factory.frame_sink_id(),
+  SurfaceId embedded_surface_id(factory_.frame_sink_id(),
                                 embedded_local_frame_id);
+  factory_.Create(embedded_local_frame_id);
 
   test::Quad embedded_quads[] = {test::Quad::SolidColorQuad(SK_ColorGREEN),
                                  test::Quad::SolidColorQuad(SK_ColorBLUE)};
   test::Pass embedded_passes[] = {
       test::Pass(embedded_quads, arraysize(embedded_quads))};
 
-  SubmitCompositorFrame(&embedded_factory, embedded_passes,
-                        arraysize(embedded_passes), embedded_local_frame_id);
+  SubmitCompositorFrame(&factory_, embedded_passes, arraysize(embedded_passes),
+                        embedded_local_frame_id);
 
   test::Quad quads[] = {test::Quad::SurfaceQuad(embedded_surface_id, .5f)};
   test::Pass passes[] = {test::Pass(quads, arraysize(quads))};
 
   SubmitCompositorFrame(&factory_, passes, arraysize(passes),
                         root_local_frame_id_);
 
   SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_frame_id_);
   CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
   RenderPassList& render_pass_list(aggregated_frame.render_pass_list);
   ASSERT_EQ(2u, render_pass_list.size());
   SharedQuadStateList& shared_quad_state_list(
       render_pass_list[0]->shared_quad_state_list);
   ASSERT_EQ(2u, shared_quad_state_list.size());
   EXPECT_EQ(1.f, shared_quad_state_list.ElementAt(0)->opacity);
   EXPECT_EQ(1.f, shared_quad_state_list.ElementAt(1)->opacity);
 
   SharedQuadStateList& shared_quad_state_list2(
       render_pass_list[1]->shared_quad_state_list);
   ASSERT_EQ(1u, shared_quad_state_list2.size());
   EXPECT_EQ(.5f, shared_quad_state_list2.ElementAt(0)->opacity);
 
-  embedded_factory.EvictSurface();
+  factory_.Destroy(embedded_local_frame_id);
 }
 
 TEST_F(SurfaceAggregatorValidSurfaceTest, MultiPassSimpleFrame) {
   test::Quad quads[][2] = {{test::Quad::SolidColorQuad(SK_ColorWHITE),
                             test::Quad::SolidColorQuad(SK_ColorLTGRAY)},
                            {test::Quad::SolidColorQuad(SK_ColorGRAY),
                             test::Quad::SolidColorQuad(SK_ColorDKGRAY)}};
   test::Pass passes[] = {
       test::Pass(quads[0], arraysize(quads[0]), RenderPassId(1, 1)),
       test::Pass(quads[1], arraysize(quads[1]), RenderPassId(1, 2))};
 
   SubmitCompositorFrame(&factory_, passes, arraysize(passes),
                         root_local_frame_id_);
 
   SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_frame_id_);
   SurfaceId ids[] = {root_surface_id};
 
   AggregateAndVerify(passes, arraysize(passes), ids, arraysize(ids));
 }
 
 // This tests very simple embedding. root_surface has a frame containing a few
 // solid color quads and a surface quad referencing embedded_surface.
 // embedded_surface has a frame containing only a solid color quad. The solid
 // color quad should be aggregated into the final frame.
 TEST_F(SurfaceAggregatorValidSurfaceTest, SimpleSurfaceReference) {
-  SurfaceFactory embedded_factory(kArbitraryChildFrameSinkId, &manager_,
-                                  &empty_client_);
   LocalFrameId embedded_local_frame_id = allocator_.GenerateId();
-  SurfaceId embedded_surface_id(embedded_factory.frame_sink_id(),
+  SurfaceId embedded_surface_id(factory_.frame_sink_id(),
                                 embedded_local_frame_id);
+  factory_.Create(embedded_local_frame_id);
 
   test::Quad embedded_quads[] = {test::Quad::SolidColorQuad(SK_ColorGREEN)};
   test::Pass embedded_passes[] = {
       test::Pass(embedded_quads, arraysize(embedded_quads))};
 
-  SubmitCompositorFrame(&embedded_factory, embedded_passes,
-                        arraysize(embedded_passes), embedded_local_frame_id);
+  SubmitCompositorFrame(&factory_, embedded_passes, arraysize(embedded_passes),
+                        embedded_local_frame_id);
 
   test::Quad root_quads[] = {test::Quad::SolidColorQuad(SK_ColorWHITE),
                              test::Quad::SurfaceQuad(embedded_surface_id, 1.f),
                              test::Quad::SolidColorQuad(SK_ColorBLACK)};
   test::Pass root_passes[] = {test::Pass(root_quads, arraysize(root_quads))};
 
   SubmitCompositorFrame(&factory_, root_passes, arraysize(root_passes),
                         root_local_frame_id_);
 
   test::Quad expected_quads[] = {test::Quad::SolidColorQuad(SK_ColorWHITE),
                                  test::Quad::SolidColorQuad(SK_ColorGREEN),
                                  test::Quad::SolidColorQuad(SK_ColorBLACK)};
   test::Pass expected_passes[] = {
       test::Pass(expected_quads, arraysize(expected_quads))};
   SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_frame_id_);
   SurfaceId ids[] = {root_surface_id, embedded_surface_id};
   AggregateAndVerify(
       expected_passes, arraysize(expected_passes), ids, arraysize(ids));
 
-  embedded_factory.EvictSurface();
+  factory_.Destroy(embedded_local_frame_id);
 }
 
 TEST_F(SurfaceAggregatorValidSurfaceTest, CopyRequest) {
-  SurfaceFactory embedded_factory(kArbitraryChildFrameSinkId, &manager_,
-                                  &empty_client_);
   LocalFrameId embedded_local_frame_id = allocator_.GenerateId();
-  SurfaceId embedded_surface_id(embedded_factory.frame_sink_id(),
+  SurfaceId embedded_surface_id(factory_.frame_sink_id(),
                                 embedded_local_frame_id);
+  factory_.Create(embedded_local_frame_id);
 
   test::Quad embedded_quads[] = {test::Quad::SolidColorQuad(SK_ColorGREEN)};
   test::Pass embedded_passes[] = {
       test::Pass(embedded_quads, arraysize(embedded_quads))};
 
-  SubmitCompositorFrame(&embedded_factory, embedded_passes,
-                        arraysize(embedded_passes), embedded_local_frame_id);
+  SubmitCompositorFrame(&factory_, embedded_passes, arraysize(embedded_passes),
+                        embedded_local_frame_id);
   std::unique_ptr<CopyOutputRequest> copy_request(
       CopyOutputRequest::CreateEmptyRequest());
   CopyOutputRequest* copy_request_ptr = copy_request.get();
-  embedded_factory.RequestCopyOfSurface(std::move(copy_request));
+  factory_.RequestCopyOfSurface(embedded_local_frame_id,
+                                std::move(copy_request));
 
   test::Quad root_quads[] = {test::Quad::SolidColorQuad(SK_ColorWHITE),
                              test::Quad::SurfaceQuad(embedded_surface_id, 1.f),
                              test::Quad::SolidColorQuad(SK_ColorBLACK)};
   test::Pass root_passes[] = {test::Pass(root_quads, arraysize(root_quads))};
 
   SubmitCompositorFrame(&factory_, root_passes, arraysize(root_passes),
                         root_local_frame_id_);
 
   SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_frame_id_);
@@ skipping 15 matching lines @@
 
   SurfaceId surface_ids[] = {root_surface_id, embedded_surface_id};
   EXPECT_EQ(arraysize(surface_ids),
             aggregator_.previous_contained_surfaces().size());
   for (size_t i = 0; i < arraysize(surface_ids); i++) {
     EXPECT_TRUE(
         aggregator_.previous_contained_surfaces().find(surface_ids[i]) !=
         aggregator_.previous_contained_surfaces().end());
   }
 
-  embedded_factory.EvictSurface();
+  factory_.Destroy(embedded_local_frame_id);
 }
 
 // Root surface may contain copy requests.
 TEST_F(SurfaceAggregatorValidSurfaceTest, RootCopyRequest) {
-  SurfaceFactory embedded_factory(kArbitraryChildFrameSinkId, &manager_,
-                                  &empty_client_);
   LocalFrameId embedded_local_frame_id = allocator_.GenerateId();
-  SurfaceId embedded_surface_id(embedded_factory.frame_sink_id(),
+  SurfaceId embedded_surface_id(factory_.frame_sink_id(),
                                 embedded_local_frame_id);
+  factory_.Create(embedded_local_frame_id);
 
   test::Quad embedded_quads[] = {test::Quad::SolidColorQuad(SK_ColorGREEN)};
   test::Pass embedded_passes[] = {
       test::Pass(embedded_quads, arraysize(embedded_quads))};
 
-  SubmitCompositorFrame(&embedded_factory, embedded_passes,
-                        arraysize(embedded_passes), embedded_local_frame_id);
+  SubmitCompositorFrame(&factory_, embedded_passes, arraysize(embedded_passes),
+                        embedded_local_frame_id);
   std::unique_ptr<CopyOutputRequest> copy_request(
       CopyOutputRequest::CreateEmptyRequest());
   CopyOutputRequest* copy_request_ptr = copy_request.get();
   std::unique_ptr<CopyOutputRequest> copy_request2(
       CopyOutputRequest::CreateEmptyRequest());
   CopyOutputRequest* copy_request2_ptr = copy_request2.get();
 
   test::Quad root_quads[] = {test::Quad::SolidColorQuad(SK_ColorWHITE),
                              test::Quad::SurfaceQuad(embedded_surface_id, 1.f),
                              test::Quad::SolidColorQuad(SK_ColorBLACK)};
@@ skipping 42 matching lines @@
   }
 
   // Ensure copy requests have been removed from root surface.
   const CompositorFrame& original_frame =
       manager_.GetSurfaceForId(root_surface_id)->GetEligibleFrame();
   const RenderPassList& original_pass_list = original_frame.render_pass_list;
   ASSERT_EQ(2u, original_pass_list.size());
   DCHECK(original_pass_list[0]->copy_requests.empty());
   DCHECK(original_pass_list[1]->copy_requests.empty());
 
-  embedded_factory.EvictSurface();
+  factory_.Destroy(embedded_local_frame_id);
 }
 
 TEST_F(SurfaceAggregatorValidSurfaceTest, UnreferencedSurface) {
-  SurfaceFactory embedded_factory(kArbitraryChildFrameSinkId, &manager_,
-                                  &empty_client_);
-  SurfaceFactory parent_factory(kArbitraryRootFrameSinkId, &manager_,
-                                &empty_client_);
   LocalFrameId embedded_local_frame_id = allocator_.GenerateId();
-  SurfaceId embedded_surface_id(embedded_factory.frame_sink_id(),
+  SurfaceId embedded_surface_id(factory_.frame_sink_id(),
                                 embedded_local_frame_id);
   SurfaceId nonexistent_surface_id(factory_.frame_sink_id(),
                                    allocator_.GenerateId());
+  factory_.Create(embedded_local_frame_id);
 
   test::Quad embedded_quads[] = {test::Quad::SolidColorQuad(SK_ColorGREEN)};
   test::Pass embedded_passes[] = {
       test::Pass(embedded_quads, arraysize(embedded_quads))};
 
-  SubmitCompositorFrame(&embedded_factory, embedded_passes,
-                        arraysize(embedded_passes), embedded_local_frame_id);
+  SubmitCompositorFrame(&factory_, embedded_passes, arraysize(embedded_passes),
+                        embedded_local_frame_id);
   std::unique_ptr<CopyOutputRequest> copy_request(
       CopyOutputRequest::CreateEmptyRequest());
   CopyOutputRequest* copy_request_ptr = copy_request.get();
-  embedded_factory.RequestCopyOfSurface(std::move(copy_request));
+  factory_.RequestCopyOfSurface(embedded_local_frame_id,
+                                std::move(copy_request));
 
   LocalFrameId parent_local_frame_id = allocator_.GenerateId();
-  SurfaceId parent_surface_id(parent_factory.frame_sink_id(),
-                              parent_local_frame_id);
+  SurfaceId parent_surface_id(factory_.frame_sink_id(), parent_local_frame_id);
+  factory_.Create(parent_local_frame_id);
 
   test::Quad parent_quads[] = {
       test::Quad::SolidColorQuad(SK_ColorWHITE),
       test::Quad::SurfaceQuad(embedded_surface_id, 1.f),
       test::Quad::SolidColorQuad(SK_ColorBLACK)};
   test::Pass parent_passes[] = {
       test::Pass(parent_quads, arraysize(parent_quads))};
 
   {
     CompositorFrame frame;
 
     AddPasses(&frame.render_pass_list, gfx::Rect(SurfaceSize()), parent_passes,
               arraysize(parent_passes));
 
     frame.metadata.referenced_surfaces.push_back(embedded_surface_id);
 
-    parent_factory.SubmitCompositorFrame(parent_local_frame_id,
-                                         std::move(frame),
-                                         SurfaceFactory::DrawCallback());
+    factory_.SubmitCompositorFrame(parent_local_frame_id, std::move(frame),
+                                   SurfaceFactory::DrawCallback());
   }
 
   test::Quad root_quads[] = {test::Quad::SolidColorQuad(SK_ColorWHITE),
                              test::Quad::SolidColorQuad(SK_ColorBLACK)};
   test::Pass root_passes[] = {test::Pass(root_quads, arraysize(root_quads))};
 
   {
     CompositorFrame frame;
     AddPasses(&frame.render_pass_list, gfx::Rect(SurfaceSize()), root_passes,
               arraysize(root_passes));
@@ skipping 28 matching lines @@
       SurfaceId(factory_.frame_sink_id(), root_local_frame_id_),
       parent_surface_id, embedded_surface_id, nonexistent_surface_id};
   EXPECT_EQ(arraysize(surface_ids),
             aggregator_.previous_contained_surfaces().size());
   for (size_t i = 0; i < arraysize(surface_ids); i++) {
     EXPECT_TRUE(
         aggregator_.previous_contained_surfaces().find(surface_ids[i]) !=
         aggregator_.previous_contained_surfaces().end());
   }
 
-  embedded_factory.EvictSurface();
-  parent_factory.EvictSurface();
+  factory_.Destroy(parent_local_frame_id);
+  factory_.Destroy(embedded_local_frame_id);
 }
 
 // This tests referencing a surface that has multiple render passes.
 TEST_F(SurfaceAggregatorValidSurfaceTest, MultiPassSurfaceReference) {
   LocalFrameId embedded_local_frame_id = child_allocator_.GenerateId();
   SurfaceId embedded_surface_id(child_factory_.frame_sink_id(),
                                 embedded_local_frame_id);
+  child_factory_.Create(embedded_local_frame_id);
 
   RenderPassId pass_ids[] = {RenderPassId(1, 1), RenderPassId(1, 2),
                              RenderPassId(1, 3)};
 
   test::Quad embedded_quads[][2] = {
       {test::Quad::SolidColorQuad(1), test::Quad::SolidColorQuad(2)},
       {test::Quad::SolidColorQuad(3), test::Quad::RenderPassQuad(pass_ids[0])},
       {test::Quad::SolidColorQuad(4), test::Quad::RenderPassQuad(pass_ids[1])}};
   test::Pass embedded_passes[] = {
       test::Pass(embedded_quads[0], arraysize(embedded_quads[0]), pass_ids[0]),
@@ skipping 110 matching lines @@
     // The last quad in the last pass will reference the second pass from the
     // root surface, which after aggregating is the fourth pass in the overall
     // list.
     ASSERT_EQ(DrawQuad::RENDER_PASS,
               fifth_pass_quad_list.ElementAt(1)->material);
     const RenderPassDrawQuad* fifth_pass_render_pass_draw_quad =
         RenderPassDrawQuad::MaterialCast(fifth_pass_quad_list.ElementAt(1));
     EXPECT_EQ(actual_pass_ids[3],
               fifth_pass_render_pass_draw_quad->render_pass_id);
   }
+  child_factory_.Destroy(embedded_local_frame_id);
 }
 
 // Tests an invalid surface reference in a frame. The surface quad should just
 // be dropped.
 TEST_F(SurfaceAggregatorValidSurfaceTest, InvalidSurfaceReference) {
   test::Quad quads[] = {test::Quad::SolidColorQuad(SK_ColorGREEN),
                         test::Quad::SurfaceQuad(InvalidSurfaceId(), 1.f),
                         test::Quad::SolidColorQuad(SK_ColorBLUE)};
   test::Pass passes[] = {test::Pass(quads, arraysize(quads))};
 
@@ skipping 10 matching lines @@
   AggregateAndVerify(
       expected_passes, arraysize(expected_passes), ids, arraysize(ids));
 }
 
 // Tests a reference to a valid surface with no submitted frame. This quad
 // should also just be dropped.
 TEST_F(SurfaceAggregatorValidSurfaceTest, ValidSurfaceReferenceWithNoFrame) {
   LocalFrameId empty_local_frame_id = allocator_.GenerateId();
   SurfaceId surface_with_no_frame_id(factory_.frame_sink_id(),
                                      empty_local_frame_id);
+  factory_.Create(empty_local_frame_id);
 
   test::Quad quads[] = {test::Quad::SolidColorQuad(SK_ColorGREEN),
                         test::Quad::SurfaceQuad(surface_with_no_frame_id, 1.f),
                         test::Quad::SolidColorQuad(SK_ColorBLUE)};
   test::Pass passes[] = {test::Pass(quads, arraysize(quads))};
 
   SubmitCompositorFrame(&factory_, passes, arraysize(passes),
                         root_local_frame_id_);
 
   test::Quad expected_quads[] = {test::Quad::SolidColorQuad(SK_ColorGREEN),
                                  test::Quad::SolidColorQuad(SK_ColorBLUE)};
   test::Pass expected_passes[] = {
       test::Pass(expected_quads, arraysize(expected_quads))};
   SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_frame_id_);
   SurfaceId ids[] = {root_surface_id, surface_with_no_frame_id};
   AggregateAndVerify(
       expected_passes, arraysize(expected_passes), ids, arraysize(ids));
+  factory_.Destroy(empty_local_frame_id);
 }
 
 // Tests a surface quad referencing itself, generating a trivial cycle.
 // The quad creating the cycle should be dropped from the final frame.
 TEST_F(SurfaceAggregatorValidSurfaceTest, SimpleCyclicalReference) {
   SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_frame_id_);
   test::Quad quads[] = {test::Quad::SurfaceQuad(root_surface_id, 1.f),
                         test::Quad::SolidColorQuad(SK_ColorYELLOW)};
   test::Pass passes[] = {test::Pass(quads, arraysize(quads))};
 
   SubmitCompositorFrame(&factory_, passes, arraysize(passes),
                         root_local_frame_id_);
 
   test::Quad expected_quads[] = {test::Quad::SolidColorQuad(SK_ColorYELLOW)};
   test::Pass expected_passes[] = {
       test::Pass(expected_quads, arraysize(expected_quads))};
   SurfaceId ids[] = {root_surface_id};
   AggregateAndVerify(
       expected_passes, arraysize(expected_passes), ids, arraysize(ids));
 }
 
 // Tests a more complex cycle with one intermediate surface.
 TEST_F(SurfaceAggregatorValidSurfaceTest, TwoSurfaceCyclicalReference) {
   LocalFrameId child_local_frame_id = allocator_.GenerateId();
-  SurfaceId child_surface_id(child_factory_.frame_sink_id(),
-                             child_local_frame_id);
+  SurfaceId child_surface_id(factory_.frame_sink_id(), child_local_frame_id);
+  factory_.Create(child_local_frame_id);
 
   test::Quad parent_quads[] = {test::Quad::SolidColorQuad(SK_ColorBLUE),
                                test::Quad::SurfaceQuad(child_surface_id, 1.f),
                                test::Quad::SolidColorQuad(SK_ColorCYAN)};
   test::Pass parent_passes[] = {
       test::Pass(parent_quads, arraysize(parent_quads))};
 
   SubmitCompositorFrame(&factory_, parent_passes, arraysize(parent_passes),
                         root_local_frame_id_);
 
   SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_frame_id_);
   test::Quad child_quads[] = {test::Quad::SolidColorQuad(SK_ColorGREEN),
                               test::Quad::SurfaceQuad(root_surface_id, 1.f),
                               test::Quad::SolidColorQuad(SK_ColorMAGENTA)};
   test::Pass child_passes[] = {test::Pass(child_quads, arraysize(child_quads))};
 
-  SubmitCompositorFrame(&child_factory_, child_passes, arraysize(child_passes),
+  SubmitCompositorFrame(&factory_, child_passes, arraysize(child_passes),
                         child_local_frame_id);
 
   // The child surface's reference to the root_surface_ will be dropped, so
   // we'll end up with:
   //   SK_ColorBLUE from the parent
   //   SK_ColorGREEN from the child
   //   SK_ColorMAGENTA from the child
   //   SK_ColorCYAN from the parent
   test::Quad expected_quads[] = {test::Quad::SolidColorQuad(SK_ColorBLUE),
                                  test::Quad::SolidColorQuad(SK_ColorGREEN),
                                  test::Quad::SolidColorQuad(SK_ColorMAGENTA),
                                  test::Quad::SolidColorQuad(SK_ColorCYAN)};
   test::Pass expected_passes[] = {
       test::Pass(expected_quads, arraysize(expected_quads))};
   SurfaceId ids[] = {root_surface_id, child_surface_id};
   AggregateAndVerify(
       expected_passes, arraysize(expected_passes), ids, arraysize(ids));
+  factory_.Destroy(child_local_frame_id);
 }
 
 // Tests that we map render pass IDs from different surfaces into a unified
 // namespace and update RenderPassDrawQuad's id references to match.
 TEST_F(SurfaceAggregatorValidSurfaceTest, RenderPassIdMapping) {
   LocalFrameId child_local_frame_id = allocator_.GenerateId();
-  SurfaceId child_surface_id(child_factory_.frame_sink_id(),
-                             child_local_frame_id);
+  SurfaceId child_surface_id(factory_.frame_sink_id(), child_local_frame_id);
+  factory_.Create(child_local_frame_id);
 
   RenderPassId child_pass_id[] = {RenderPassId(1, 1), RenderPassId(1, 2)};
   test::Quad child_quad[][1] = {{test::Quad::SolidColorQuad(SK_ColorGREEN)},
                                 {test::Quad::RenderPassQuad(child_pass_id[0])}};
   test::Pass surface_passes[] = {
       test::Pass(child_quad[0], arraysize(child_quad[0]), child_pass_id[0]),
       test::Pass(child_quad[1], arraysize(child_quad[1]), child_pass_id[1])};
 
-  SubmitCompositorFrame(&child_factory_, surface_passes,
-                        arraysize(surface_passes), child_local_frame_id);
+  SubmitCompositorFrame(&factory_, surface_passes, arraysize(surface_passes),
+                        child_local_frame_id);
 
   // Pass IDs from the parent surface may collide with ones from the child.
   RenderPassId parent_pass_id[] = {RenderPassId(2, 1), RenderPassId(1, 2)};
   test::Quad parent_quad[][1] = {
       {test::Quad::SurfaceQuad(child_surface_id, 1.f)},
       {test::Quad::RenderPassQuad(parent_pass_id[0])}};
   test::Pass parent_passes[] = {
       test::Pass(parent_quad[0], arraysize(parent_quad[0]), parent_pass_id[0]),
       test::Pass(parent_quad[1], arraysize(parent_quad[1]), parent_pass_id[1])};
 
@@ skipping 23 matching lines @@
                                    aggregated_pass_list[2]->quad_list.front()};
   ASSERT_EQ(render_pass_quads[0]->material, DrawQuad::RENDER_PASS);
   EXPECT_EQ(
       actual_pass_ids[0],
       RenderPassDrawQuad::MaterialCast(render_pass_quads[0])->render_pass_id);
 
   ASSERT_EQ(render_pass_quads[1]->material, DrawQuad::RENDER_PASS);
   EXPECT_EQ(
       actual_pass_ids[1],
       RenderPassDrawQuad::MaterialCast(render_pass_quads[1])->render_pass_id);
+  factory_.Destroy(child_local_frame_id);
 }
 
 void AddSolidColorQuadWithBlendMode(const gfx::Size& size,
                                     RenderPass* pass,
                                     const SkXfermode::Mode blend_mode) {
   const gfx::Transform layer_to_target_transform;
   const gfx::Size layer_bounds(size);
   const gfx::Rect visible_layer_rect(size);
   const gfx::Rect clip_rect(size);
 
@@ skipping 42 matching lines @@
 TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateSharedQuadStateProperties) {
   const SkXfermode::Mode blend_modes[] = {SkXfermode::kClear_Mode,    // 0
                                           SkXfermode::kSrc_Mode,      // 1
                                           SkXfermode::kDst_Mode,      // 2
                                           SkXfermode::kSrcOver_Mode,  // 3
                                           SkXfermode::kDstOver_Mode,  // 4
                                           SkXfermode::kSrcIn_Mode,    // 5
                                           SkXfermode::kDstIn_Mode,    // 6
   };
 
-  SurfaceFactory grandchild_factory(FrameSinkId(2, 2), &manager_,
-                                    &empty_client_);
-  SurfaceFactory child_one_factory(FrameSinkId(3, 3), &manager_,
-                                   &empty_client_);
-  SurfaceFactory child_two_factory(FrameSinkId(4, 4), &manager_,
-                                   &empty_client_);
   RenderPassId pass_id(1, 1);
   LocalFrameId grandchild_local_frame_id = allocator_.GenerateId();
-  SurfaceId grandchild_surface_id(grandchild_factory.frame_sink_id(),
+  SurfaceId grandchild_surface_id(factory_.frame_sink_id(),
                                   grandchild_local_frame_id);
-  grandchild_factory.SubmitCompositorFrame(grandchild_local_frame_id,
-                                           CompositorFrame(),
-                                           SurfaceFactory::DrawCallback());
+  factory_.Create(grandchild_local_frame_id);
   std::unique_ptr<RenderPass> grandchild_pass = RenderPass::Create();
   gfx::Rect output_rect(SurfaceSize());
   gfx::Rect damage_rect(SurfaceSize());
   gfx::Transform transform_to_root_target;
   grandchild_pass->SetNew(
       pass_id, output_rect, damage_rect, transform_to_root_target);
   AddSolidColorQuadWithBlendMode(
       SurfaceSize(), grandchild_pass.get(), blend_modes[2]);
-  QueuePassAsFrame(std::move(grandchild_pass), grandchild_local_frame_id,
-                   &grandchild_factory);
+  QueuePassAsFrame(std::move(grandchild_pass), grandchild_local_frame_id);
 
   LocalFrameId child_one_local_frame_id = allocator_.GenerateId();
-  SurfaceId child_one_surface_id(child_one_factory.frame_sink_id(),
+  SurfaceId child_one_surface_id(factory_.frame_sink_id(),
                                  child_one_local_frame_id);
-  child_one_factory.SubmitCompositorFrame(child_one_local_frame_id,
-                                          CompositorFrame(),
-                                          SurfaceFactory::DrawCallback());
+  factory_.Create(child_one_local_frame_id);
 
   std::unique_ptr<RenderPass> child_one_pass = RenderPass::Create();
   child_one_pass->SetNew(
       pass_id, output_rect, damage_rect, transform_to_root_target);
   AddSolidColorQuadWithBlendMode(
       SurfaceSize(), child_one_pass.get(), blend_modes[1]);
   SurfaceDrawQuad* grandchild_surface_quad =
       child_one_pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
   grandchild_surface_quad->SetNew(child_one_pass->shared_quad_state_list.back(),
                                   gfx::Rect(SurfaceSize()),
                                   gfx::Rect(SurfaceSize()),
                                   grandchild_surface_id);
   AddSolidColorQuadWithBlendMode(
       SurfaceSize(), child_one_pass.get(), blend_modes[3]);
-  QueuePassAsFrame(std::move(child_one_pass), child_one_local_frame_id,
-                   &child_one_factory);
+  QueuePassAsFrame(std::move(child_one_pass), child_one_local_frame_id);
 
   LocalFrameId child_two_local_frame_id = allocator_.GenerateId();
-  SurfaceId child_two_surface_id(child_two_factory.frame_sink_id(),
+  SurfaceId child_two_surface_id(factory_.frame_sink_id(),
                                  child_two_local_frame_id);
-  child_two_factory.SubmitCompositorFrame(child_two_local_frame_id,
-                                          CompositorFrame(),
-                                          SurfaceFactory::DrawCallback());
+  factory_.Create(child_two_local_frame_id);
 
   std::unique_ptr<RenderPass> child_two_pass = RenderPass::Create();
   child_two_pass->SetNew(
       pass_id, output_rect, damage_rect, transform_to_root_target);
   AddSolidColorQuadWithBlendMode(
       SurfaceSize(), child_two_pass.get(), blend_modes[5]);
-  QueuePassAsFrame(std::move(child_two_pass), child_two_local_frame_id,
-                   &child_two_factory);
+  QueuePassAsFrame(std::move(child_two_pass), child_two_local_frame_id);
 
   std::unique_ptr<RenderPass> root_pass = RenderPass::Create();
   root_pass->SetNew(
       pass_id, output_rect, damage_rect, transform_to_root_target);
 
   AddSolidColorQuadWithBlendMode(
       SurfaceSize(), root_pass.get(), blend_modes[0]);
   SurfaceDrawQuad* child_one_surface_quad =
       root_pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
   child_one_surface_quad->SetNew(root_pass->shared_quad_state_list.back(),
                                  gfx::Rect(SurfaceSize()),
                                  gfx::Rect(SurfaceSize()),
                                  child_one_surface_id);
   AddSolidColorQuadWithBlendMode(
       SurfaceSize(), root_pass.get(), blend_modes[4]);
   SurfaceDrawQuad* child_two_surface_quad =
       root_pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
   child_two_surface_quad->SetNew(root_pass->shared_quad_state_list.back(),
                                  gfx::Rect(SurfaceSize()),
                                  gfx::Rect(SurfaceSize()),
                                  child_two_surface_id);
   AddSolidColorQuadWithBlendMode(
       SurfaceSize(), root_pass.get(), blend_modes[6]);
 
-  QueuePassAsFrame(std::move(root_pass), root_local_frame_id_, &factory_);
+  QueuePassAsFrame(std::move(root_pass), root_local_frame_id_);
 
   SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_frame_id_);
   CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
   const RenderPassList& aggregated_pass_list =
       aggregated_frame.render_pass_list;
 
   ASSERT_EQ(1u, aggregated_pass_list.size());
 
   const QuadList& aggregated_quad_list = aggregated_pass_list[0]->quad_list;
 
   ASSERT_EQ(7u, aggregated_quad_list.size());
 
   for (auto iter = aggregated_quad_list.cbegin();
        iter != aggregated_quad_list.cend();
        ++iter) {
     EXPECT_EQ(blend_modes[iter.index()], iter->shared_quad_state->blend_mode)
         << iter.index();
   }
-
-  grandchild_factory.EvictSurface();
-  child_one_factory.EvictSurface();
-  child_two_factory.EvictSurface();
+  factory_.Destroy(child_one_local_frame_id);
+  factory_.Destroy(child_two_local_frame_id);
+  factory_.Destroy(grandchild_local_frame_id);
 }
 
 // This tests that when aggregating a frame with multiple render passes that we
 // map the transforms for the root pass but do not modify the transform on child
 // passes.
 //
 // The root surface has one pass with a surface quad transformed by +10 in the y
 // direction.
 //
 // The middle surface has one pass with a surface quad scaled by 2 in the x
 // and 3 in the y directions.
 //
 // The child surface has two passes. The first pass has a quad with a transform
 // of +5 in the x direction. The second pass has a reference to the first pass'
 // pass id and a transform of +8 in the x direction.
 //
 // After aggregation, the child surface's root pass quad should have all
 // transforms concatenated for a total transform of +23 x, +10 y. The
 // contributing render pass' transform in the aggregate frame should not be
 // affected.
 TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateMultiplePassWithTransform) {
-  SurfaceFactory middle_factory(kArbitraryMiddleFrameSinkId, &manager_,
-                                &empty_client_);
   // Innermost child surface.
   LocalFrameId child_local_frame_id = allocator_.GenerateId();
-  SurfaceId child_surface_id(child_factory_.frame_sink_id(),
-                             child_local_frame_id);
+  SurfaceId child_surface_id(factory_.frame_sink_id(), child_local_frame_id);
+  factory_.Create(child_local_frame_id);
   {
     RenderPassId child_pass_id[] = {RenderPassId(1, 1), RenderPassId(1, 2)};
     test::Quad child_quads[][1] = {
         {test::Quad::SolidColorQuad(SK_ColorGREEN)},
         {test::Quad::RenderPassQuad(child_pass_id[0])},
     };
     test::Pass child_passes[] = {
         test::Pass(child_quads[0], arraysize(child_quads[0]), child_pass_id[0]),
         test::Pass(child_quads[1], arraysize(child_quads[1]),
                    child_pass_id[1])};
 
     CompositorFrame child_frame;
     AddPasses(&child_frame.render_pass_list, gfx::Rect(SurfaceSize()),
               child_passes, arraysize(child_passes));
 
     RenderPass* child_nonroot_pass = child_frame.render_pass_list[0].get();
     child_nonroot_pass->transform_to_root_target.Translate(8, 0);
     SharedQuadState* child_nonroot_pass_sqs =
         child_nonroot_pass->shared_quad_state_list.front();
     child_nonroot_pass_sqs->quad_to_target_transform.Translate(5, 0);
 
     RenderPass* child_root_pass = child_frame.render_pass_list[1].get();
     SharedQuadState* child_root_pass_sqs =
         child_root_pass->shared_quad_state_list.front();
     child_root_pass_sqs->quad_to_target_transform.Translate(8, 0);
     child_root_pass_sqs->is_clipped = true;
     child_root_pass_sqs->clip_rect = gfx::Rect(0, 0, 5, 5);
 
-    child_factory_.SubmitCompositorFrame(child_local_frame_id,
-                                         std::move(child_frame),
-                                         SurfaceFactory::DrawCallback());
+    factory_.SubmitCompositorFrame(child_local_frame_id, std::move(child_frame),
+                                   SurfaceFactory::DrawCallback());
   }
 
   // Middle child surface.
   LocalFrameId middle_local_frame_id = allocator_.GenerateId();
-  SurfaceId middle_surface_id(middle_factory.frame_sink_id(),
-                              middle_local_frame_id);
+  SurfaceId middle_surface_id(factory_.frame_sink_id(), middle_local_frame_id);
+  factory_.Create(middle_local_frame_id);
   {
     test::Quad middle_quads[] = {
         test::Quad::SurfaceQuad(child_surface_id, 1.f)};
     test::Pass middle_passes[] = {
         test::Pass(middle_quads, arraysize(middle_quads)),
     };
 
     CompositorFrame middle_frame;
     AddPasses(&middle_frame.render_pass_list, gfx::Rect(SurfaceSize()),
               middle_passes, arraysize(middle_passes));
 
     RenderPass* middle_root_pass = middle_frame.render_pass_list[0].get();
     middle_root_pass->quad_list.ElementAt(0)->visible_rect =
         gfx::Rect(0, 1, 100, 7);
     SharedQuadState* middle_root_pass_sqs =
         middle_root_pass->shared_quad_state_list.front();
     middle_root_pass_sqs->quad_to_target_transform.Scale(2, 3);
 
-    middle_factory.SubmitCompositorFrame(middle_local_frame_id,
-                                         std::move(middle_frame),
-                                         SurfaceFactory::DrawCallback());
+    factory_.SubmitCompositorFrame(middle_local_frame_id,
+                                   std::move(middle_frame),
+                                   SurfaceFactory::DrawCallback());
   }
 
   // Root surface.
   test::Quad secondary_quads[] = {
       test::Quad::SolidColorQuad(1),
       test::Quad::SurfaceQuad(middle_surface_id, 1.f)};
   test::Quad root_quads[] = {test::Quad::SolidColorQuad(1)};
   test::Pass root_passes[] = {
       test::Pass(secondary_quads, arraysize(secondary_quads)),
       test::Pass(root_quads, arraysize(root_quads))};
@@ skipping 82 matching lines @@
       aggregated_pass_list[1]->shared_quad_state_list.ElementAt(1)->is_clipped);
 
   // The second quad in the root pass is aggregated from the child, so its
   // clip rect must be transformed by the child's translation/scale and
   // clipped be the visible_rects for both children.
   EXPECT_EQ(gfx::Rect(0, 13, 8, 12).ToString(),
             aggregated_pass_list[1]
                 ->shared_quad_state_list.ElementAt(1)
                 ->clip_rect.ToString());
 
-  middle_factory.EvictSurface();
+  factory_.Destroy(middle_local_frame_id);
+  factory_.Destroy(child_local_frame_id);
 }
 
 // Tests that damage rects are aggregated correctly when surfaces change.
 TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateDamageRect) {
-  SurfaceFactory parent_factory(kArbitraryMiddleFrameSinkId, &manager_,
-                                &empty_client_);
   test::Quad child_quads[] = {test::Quad::RenderPassQuad(RenderPassId(1, 1))};
   test::Pass child_passes[] = {
       test::Pass(child_quads, arraysize(child_quads), RenderPassId(1, 1))};
 
   CompositorFrame child_frame;
   AddPasses(&child_frame.render_pass_list, gfx::Rect(SurfaceSize()),
             child_passes, arraysize(child_passes));
 
   RenderPass* child_root_pass = child_frame.render_pass_list[0].get();
   SharedQuadState* child_root_pass_sqs =
       child_root_pass->shared_quad_state_list.front();
   child_root_pass_sqs->quad_to_target_transform.Translate(8, 0);
 
   LocalFrameId child_local_frame_id = allocator_.GenerateId();
-  SurfaceId child_surface_id(child_factory_.frame_sink_id(),
-                             child_local_frame_id);
-  child_factory_.SubmitCompositorFrame(child_local_frame_id,
-                                       std::move(child_frame),
-                                       SurfaceFactory::DrawCallback());
+  SurfaceId child_surface_id(factory_.frame_sink_id(), child_local_frame_id);
+  factory_.Create(child_local_frame_id);
+  factory_.SubmitCompositorFrame(child_local_frame_id, std::move(child_frame),
+                                 SurfaceFactory::DrawCallback());
 
   test::Quad parent_surface_quads[] = {
       test::Quad::SurfaceQuad(child_surface_id, 1.f)};
   test::Pass parent_surface_passes[] = {
       test::Pass(parent_surface_quads, arraysize(parent_surface_quads),
                  RenderPassId(1, 1))};
 
   // Parent surface is only used to test if the transform is applied correctly
   // to the child surface's damage.
   CompositorFrame parent_surface_frame;
   AddPasses(&parent_surface_frame.render_pass_list, gfx::Rect(SurfaceSize()),
             parent_surface_passes, arraysize(parent_surface_passes));
 
   LocalFrameId parent_local_frame_id = allocator_.GenerateId();
-  SurfaceId parent_surface_id(parent_factory.frame_sink_id(),
-                              parent_local_frame_id);
-  parent_factory.SubmitCompositorFrame(parent_local_frame_id,
-                                       std::move(parent_surface_frame),
-                                       SurfaceFactory::DrawCallback());
+  SurfaceId parent_surface_id(factory_.frame_sink_id(), parent_local_frame_id);
+  factory_.Create(parent_local_frame_id);
+  factory_.SubmitCompositorFrame(parent_local_frame_id,
+                                 std::move(parent_surface_frame),
+                                 SurfaceFactory::DrawCallback());
 
   test::Quad root_surface_quads[] = {
       test::Quad::SurfaceQuad(parent_surface_id, 1.f)};
   test::Quad root_render_pass_quads[] = {
       test::Quad::RenderPassQuad(RenderPassId(1, 1))};
 
   test::Pass root_passes[] = {
       test::Pass(root_surface_quads, arraysize(root_surface_quads),
                  RenderPassId(1, 1)),
       test::Pass(root_render_pass_quads, arraysize(root_render_pass_quads),
@@ skipping 28 matching lines @@
     CompositorFrame child_frame;
     AddPasses(&child_frame.render_pass_list, gfx::Rect(SurfaceSize()),
               child_passes, arraysize(child_passes));
 
     RenderPass* child_root_pass = child_frame.render_pass_list[0].get();
     SharedQuadState* child_root_pass_sqs =
         child_root_pass->shared_quad_state_list.front();
     child_root_pass_sqs->quad_to_target_transform.Translate(8, 0);
     child_root_pass->damage_rect = gfx::Rect(10, 10, 10, 10);
 
-    child_factory_.SubmitCompositorFrame(child_local_frame_id,
-                                         std::move(child_frame),
-                                         SurfaceFactory::DrawCallback());
+    factory_.SubmitCompositorFrame(child_local_frame_id, std::move(child_frame),
+                                   SurfaceFactory::DrawCallback());
 
     SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_frame_id_);
     CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
     const RenderPassList& aggregated_pass_list =
         aggregated_frame.render_pass_list;
 
     ASSERT_EQ(2u, aggregated_pass_list.size());
 
     // Outer surface didn't change, so transformed inner damage rect should be
@@ skipping 64 matching lines @@
 
     const RenderPassList& aggregated_pass_list =
         aggregated_frame.render_pass_list;
 
     ASSERT_EQ(2u, aggregated_pass_list.size());
 
     EXPECT_TRUE(aggregated_pass_list[1]->damage_rect.Contains(
         gfx::Rect(SurfaceSize())));
   }
 
-  parent_factory.EvictSurface();
+  factory_.Destroy(child_local_frame_id);
 }
 
-// Check that damage is correctly calculated for surfaces.
+// Check that damage is correctly calculated for surfaces with
+// SetPreviousFrameSurface.
 TEST_F(SurfaceAggregatorValidSurfaceTest, SwitchSurfaceDamage) {
   test::Quad root_render_pass_quads[] = {test::Quad::SolidColorQuad(1)};
 
   test::Pass root_passes[] = {test::Pass(root_render_pass_quads,
                                          arraysize(root_render_pass_quads),
                                          RenderPassId(2, 1))};
 
   CompositorFrame root_frame;
   AddPasses(&root_frame.render_pass_list, gfx::Rect(SurfaceSize()), root_passes,
             arraysize(root_passes));
@@ skipping 26 matching lines @@
     test::Pass root_passes[] = {test::Pass(root_render_pass_quads,
                                            arraysize(root_render_pass_quads),
                                            RenderPassId(2, 1))};
 
     CompositorFrame root_frame;
     AddPasses(&root_frame.render_pass_list, gfx::Rect(SurfaceSize()),
               root_passes, arraysize(root_passes));
 
     root_frame.render_pass_list[0]->damage_rect = gfx::Rect(1, 2, 3, 4);
 
+    factory_.Create(second_root_local_frame_id);
     factory_.SubmitCompositorFrame(second_root_local_frame_id,
                                    std::move(root_frame),
                                    SurfaceFactory::DrawCallback());
+    factory_.SetPreviousFrameSurface(second_root_local_frame_id,
+                                     root_local_frame_id_);
   }
   {
     CompositorFrame aggregated_frame =
         aggregator_.Aggregate(second_root_surface_id);
 
     const RenderPassList& aggregated_pass_list =
         aggregated_frame.render_pass_list;
 
     ASSERT_EQ(1u, aggregated_pass_list.size());
 
+    // Frame from SetPreviousFrameSurface was aggregated last, so damage rect
+    // from new surface should be used.
     EXPECT_EQ(gfx::Rect(1, 2, 3, 4), aggregated_pass_list[0]->damage_rect);
   }
   {
     CompositorFrame aggregated_frame =
         aggregator_.Aggregate(second_root_surface_id);
 
     const RenderPassList& aggregated_pass_list =
         aggregated_frame.render_pass_list;
 
     ASSERT_EQ(1u, aggregated_pass_list.size());
 
     // No new frame, so no new damage.
     EXPECT_TRUE(aggregated_pass_list[0]->damage_rect.IsEmpty());
   }
+  factory_.Destroy(second_root_local_frame_id);
 }
 
 class SurfaceAggregatorPartialSwapTest
     : public SurfaceAggregatorValidSurfaceTest {
  public:
   SurfaceAggregatorPartialSwapTest()
       : SurfaceAggregatorValidSurfaceTest(true) {}
 };
 
 // Tests that quads outside the damage rect are ignored.
 TEST_F(SurfaceAggregatorPartialSwapTest, IgnoreOutside) {
   LocalFrameId child_local_frame_id = allocator_.GenerateId();
-  SurfaceId child_surface_id(child_factory_.frame_sink_id(),
-                             child_local_frame_id);
+  SurfaceId child_surface_id(factory_.frame_sink_id(), child_local_frame_id);
+  factory_.Create(child_local_frame_id);
   // The child surface has three quads, one with a visible rect of 13,13 4x4 and
   // the other other with a visible rect of 10,10 2x2 (relative to root target
   // space), and one with a non-invertible transform.
   {
     RenderPassId child_pass_id = RenderPassId(1, 1);
     test::Quad child_quads1[] = {test::Quad::RenderPassQuad(child_pass_id)};
     test::Quad child_quads2[] = {test::Quad::RenderPassQuad(child_pass_id)};
     test::Quad child_quads3[] = {test::Quad::RenderPassQuad(child_pass_id)};
     test::Pass child_passes[] = {
         test::Pass(child_quads1, arraysize(child_quads1), child_pass_id),
@@ skipping 16 matching lines @@
 
     SharedQuadState* child_noninvertible_sqs =
         child_pass_list[2]->shared_quad_state_list.ElementAt(0u);
     child_noninvertible_sqs->quad_to_target_transform.matrix().setDouble(0, 0,
                                                                          0.0);
     EXPECT_FALSE(
         child_noninvertible_sqs->quad_to_target_transform.IsInvertible());
     child_pass_list[2]->quad_list.ElementAt(0)->visible_rect =
         gfx::Rect(0, 0, 2, 2);
 
-    SubmitPassListAsFrame(&child_factory_, child_local_frame_id,
-                          &child_pass_list);
+    SubmitPassListAsFrame(&factory_, child_local_frame_id, &child_pass_list);
   }
 
   {
     test::Quad root_quads[] = {test::Quad::SurfaceQuad(child_surface_id, 1.f)};
 
     test::Pass root_passes[] = {test::Pass(root_quads, arraysize(root_quads))};
 
     RenderPassList root_pass_list;
     AddPasses(&root_pass_list, gfx::Rect(SurfaceSize()), root_passes,
               arraysize(root_passes));
@@ skipping 77 matching lines @@
     child_sqs->quad_to_target_transform.Scale(2, 2);
 
     child_pass_list[1]->quad_list.ElementAt(0)->visible_rect =
         gfx::Rect(0, 0, 2, 2);
 
     RenderPass* child_root_pass = child_pass_list[1].get();
 
     child_root_pass->copy_requests.push_back(
         CopyOutputRequest::CreateEmptyRequest());
     child_root_pass->damage_rect = gfx::Rect();
-    SubmitPassListAsFrame(&child_factory_, child_local_frame_id,
-                          &child_pass_list);
+    SubmitPassListAsFrame(&factory_, child_local_frame_id, &child_pass_list);
   }
 
   {
     CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
     const RenderPassList& aggregated_pass_list =
         aggregated_frame.render_pass_list;
 
     // Output frame should have no damage, but all quads included.
     ASSERT_EQ(3u, aggregated_pass_list.size());
@@ skipping 106 matching lines @@
     EXPECT_EQ(0u, aggregated_pass_list[0]->quad_list.size());
     EXPECT_EQ(gfx::Rect(SurfaceSize()), aggregated_pass_list[1]->damage_rect);
     EXPECT_EQ(1u, aggregated_pass_list[1]->quad_list.size());
 
     // First render pass draw quad is outside damage rect, so shouldn't be
     // drawn. SurfaceDrawQuad is after background filter, so corresponding
     // RenderPassDrawQuad should be drawn.
     EXPECT_EQ(gfx::Rect(10, 10, 2, 2), aggregated_pass_list[2]->damage_rect);
     EXPECT_EQ(1u, aggregated_pass_list[2]->quad_list.size());
   }
+
+  factory_.Destroy(child_local_frame_id);
 }
 
 class SurfaceAggregatorWithResourcesTest : public testing::Test {
  public:
   void SetUp() override {
     shared_bitmap_manager_.reset(new TestSharedBitmapManager);
     resource_provider_ =
         FakeResourceProvider::Create(nullptr, shared_bitmap_manager_.get());
 
     aggregator_.reset(
@@ skipping 71 matching lines @@
                  uv_bottom_right, background_color, vertex_opacity, flipped,
                  nearest_neighbor, secure_output_only);
   }
   frame.render_pass_list.push_back(std::move(pass));
   factory->SubmitCompositorFrame(surface_id.local_frame_id(), std::move(frame),
                                  SurfaceFactory::DrawCallback());
 }
 
 TEST_F(SurfaceAggregatorWithResourcesTest, TakeResourcesOneSurface) {
   ResourceTrackingSurfaceFactoryClient client;
-  SurfaceFactory factory(kArbitraryRootFrameSinkId, &manager_, &client);
+  SurfaceFactory factory(kArbitraryFrameSinkId, &manager_, &client);
   LocalFrameId local_frame_id(7u, base::UnguessableToken::Create());
-  SurfaceId surface_id(factory.frame_sink_id(), local_frame_id);
+  SurfaceId surface_id(kArbitraryFrameSinkId, local_frame_id);
+  factory.Create(local_frame_id);
 
   ResourceId ids[] = {11, 12, 13};
   SubmitCompositorFrameWithResources(ids, arraysize(ids), true, SurfaceId(),
                                      &factory, surface_id);
 
   CompositorFrame frame = aggregator_->Aggregate(surface_id);
 
   // Nothing should be available to be returned yet.
   EXPECT_TRUE(client.returned_resources().empty());
 
   SubmitCompositorFrameWithResources(NULL, 0u, true, SurfaceId(), &factory,
                                      surface_id);
 
   frame = aggregator_->Aggregate(surface_id);
 
   ASSERT_EQ(3u, client.returned_resources().size());
   ResourceId returned_ids[3];
   for (size_t i = 0; i < 3; ++i) {
     returned_ids[i] = client.returned_resources()[i].id;
   }
   EXPECT_THAT(returned_ids,
               testing::WhenSorted(testing::ElementsAreArray(ids)));
-
-  factory.EvictSurface();
+  factory.Destroy(local_frame_id);
 }
 
 TEST_F(SurfaceAggregatorWithResourcesTest, TakeInvalidResources) {
   ResourceTrackingSurfaceFactoryClient client;
-  SurfaceFactory factory(kArbitraryRootFrameSinkId, &manager_, &client);
+  SurfaceFactory factory(kArbitraryFrameSinkId, &manager_, &client);
   LocalFrameId local_frame_id(7u, base::UnguessableToken::Create());
-  SurfaceId surface_id(factory.frame_sink_id(), local_frame_id);
+  SurfaceId surface_id(kArbitraryFrameSinkId, local_frame_id);
+  factory.Create(local_frame_id);
 
   CompositorFrame frame;
   std::unique_ptr<RenderPass> pass = RenderPass::Create();
   pass->id = RenderPassId(1, 1);
   TransferableResource resource;
   resource.id = 11;
   // ResourceProvider is software but resource is not, so it should be
   // ignored.
   resource.is_software = false;
   frame.resource_list.push_back(resource);
   frame.render_pass_list.push_back(std::move(pass));
   factory.SubmitCompositorFrame(local_frame_id, std::move(frame),
                                 SurfaceFactory::DrawCallback());
 
   CompositorFrame returned_frame = aggregator_->Aggregate(surface_id);
 
   // Nothing should be available to be returned yet.
   EXPECT_TRUE(client.returned_resources().empty());
 
   SubmitCompositorFrameWithResources(NULL, 0, true, SurfaceId(), &factory,
                                      surface_id);
   ASSERT_EQ(1u, client.returned_resources().size());
   EXPECT_EQ(11u, client.returned_resources()[0].id);
 
-  factory.EvictSurface();
+  factory.Destroy(local_frame_id);
 }
 
 TEST_F(SurfaceAggregatorWithResourcesTest, TwoSurfaces) {
   ResourceTrackingSurfaceFactoryClient client;
-  SurfaceFactory factory1(FrameSinkId(1, 1), &manager_, &client);
-  SurfaceFactory factory2(FrameSinkId(2, 2), &manager_, &client);
+  SurfaceFactory factory(kArbitraryFrameSinkId, &manager_, &client);
   LocalFrameId local_frame1_id(7u, base::UnguessableToken::Create());
-  SurfaceId surface1_id(factory1.frame_sink_id(), local_frame1_id);
+  SurfaceId surface1_id(kArbitraryFrameSinkId, local_frame1_id);
+  factory.Create(local_frame1_id);
 
   LocalFrameId local_frame2_id(8u, base::UnguessableToken::Create());
-  SurfaceId surface2_id(factory2.frame_sink_id(), local_frame2_id);
+  SurfaceId surface2_id(kArbitraryFrameSinkId, local_frame2_id);
+  factory.Create(local_frame2_id);
 
   ResourceId ids[] = {11, 12, 13};
   SubmitCompositorFrameWithResources(ids, arraysize(ids), true, SurfaceId(),
-                                     &factory1, surface1_id);
+                                     &factory, surface1_id);
   ResourceId ids2[] = {14, 15, 16};
   SubmitCompositorFrameWithResources(ids2, arraysize(ids2), true, SurfaceId(),
-                                     &factory2, surface2_id);
+                                     &factory, surface2_id);
 
   CompositorFrame frame = aggregator_->Aggregate(surface1_id);
 
-  SubmitCompositorFrameWithResources(NULL, 0, true, SurfaceId(), &factory1,
+  SubmitCompositorFrameWithResources(NULL, 0, true, SurfaceId(), &factory,
                                      surface1_id);
 
   // Nothing should be available to be returned yet.
   EXPECT_TRUE(client.returned_resources().empty());
 
   frame = aggregator_->Aggregate(surface2_id);
 
   // surface1_id wasn't referenced, so its resources should be returned.
   ASSERT_EQ(3u, client.returned_resources().size());
   ResourceId returned_ids[3];
   for (size_t i = 0; i < 3; ++i) {
     returned_ids[i] = client.returned_resources()[i].id;
   }
   EXPECT_THAT(returned_ids,
               testing::WhenSorted(testing::ElementsAreArray(ids)));
   EXPECT_EQ(3u, resource_provider_->num_resources());
-
-  factory1.EvictSurface();
-  factory2.EvictSurface();
+  factory.Destroy(local_frame1_id);
+  factory.Destroy(local_frame2_id);
 }
 
 // Ensure that aggregator completely ignores Surfaces that reference invalid
 // resources.
 TEST_F(SurfaceAggregatorWithResourcesTest, InvalidChildSurface) {
   ResourceTrackingSurfaceFactoryClient client;
-  SurfaceFactory root_factory(kArbitraryRootFrameSinkId, &manager_, &client);
-  SurfaceFactory middle_factory(kArbitraryMiddleFrameSinkId, &manager_,
-                                &client);
-  SurfaceFactory child_factory(kArbitraryChildFrameSinkId, &manager_, &client);
+  SurfaceFactory factory(kArbitraryFrameSinkId, &manager_, &client);
   LocalFrameId root_local_frame_id(7u, kArbitraryToken);
-  SurfaceId root_surface_id(root_factory.frame_sink_id(), root_local_frame_id);
+  SurfaceId root_surface_id(kArbitraryFrameSinkId, root_local_frame_id);
+  factory.Create(root_local_frame_id);
   LocalFrameId middle_local_frame_id(8u, kArbitraryToken);
-  SurfaceId middle_surface_id(middle_factory.frame_sink_id(),
-                              middle_local_frame_id);
+  SurfaceId middle_surface_id(kArbitraryFrameSinkId, middle_local_frame_id);
+  factory.Create(middle_local_frame_id);
   LocalFrameId child_local_frame_id(9u, kArbitraryToken);
-  SurfaceId child_surface_id(child_factory.frame_sink_id(),
-                             child_local_frame_id);
+  SurfaceId child_surface_id(kArbitraryFrameSinkId, child_local_frame_id);
+  factory.Create(child_local_frame_id);
 
   ResourceId ids[] = {14, 15, 16};
   SubmitCompositorFrameWithResources(ids, arraysize(ids), true, SurfaceId(),
-                                     &child_factory, child_surface_id);
+                                     &factory, child_surface_id);
 
   ResourceId ids2[] = {17, 18, 19};
   SubmitCompositorFrameWithResources(ids2, arraysize(ids2), false,
-                                     child_surface_id, &middle_factory,
+                                     child_surface_id, &factory,
                                      middle_surface_id);
 
   ResourceId ids3[] = {20, 21, 22};
   SubmitCompositorFrameWithResources(ids3, arraysize(ids3), true,
-                                     middle_surface_id, &root_factory,
+                                     middle_surface_id, &factory,
                                      root_surface_id);
 
   CompositorFrame frame;
   frame = aggregator_->Aggregate(root_surface_id);
 
   RenderPassList* pass_list = &frame.render_pass_list;
   ASSERT_EQ(1u, pass_list->size());
   EXPECT_EQ(1u, pass_list->back()->shared_quad_state_list.size());
   EXPECT_EQ(3u, pass_list->back()->quad_list.size());
   SubmitCompositorFrameWithResources(ids2, arraysize(ids), true,
-                                     child_surface_id, &middle_factory,
+                                     child_surface_id, &factory,
                                      middle_surface_id);
 
   frame = aggregator_->Aggregate(root_surface_id);
 
   pass_list = &frame.render_pass_list;
   ASSERT_EQ(1u, pass_list->size());
   EXPECT_EQ(3u, pass_list->back()->shared_quad_state_list.size());
   EXPECT_EQ(9u, pass_list->back()->quad_list.size());
 
-  root_factory.EvictSurface();
-  middle_factory.EvictSurface();
-  child_factory.EvictSurface();
+  factory.Destroy(root_local_frame_id);
+  factory.Destroy(child_local_frame_id);
+  factory.Destroy(middle_local_frame_id);
 }
 
 TEST_F(SurfaceAggregatorWithResourcesTest, SecureOutputTexture) {
   ResourceTrackingSurfaceFactoryClient client;
-  SurfaceFactory factory1(FrameSinkId(1, 1), &manager_, &client);
-  SurfaceFactory factory2(FrameSinkId(2, 2), &manager_, &client);
+  SurfaceFactory factory(kArbitraryFrameSinkId, &manager_, &client);
   LocalFrameId local_frame1_id(7u, base::UnguessableToken::Create());
-  SurfaceId surface1_id(factory1.frame_sink_id(), local_frame1_id);
+  SurfaceId surface1_id(kArbitraryFrameSinkId, local_frame1_id);
+  factory.Create(local_frame1_id);
 
   LocalFrameId local_frame2_id(8u, base::UnguessableToken::Create());
-  SurfaceId surface2_id(factory2.frame_sink_id(), local_frame2_id);
+  SurfaceId surface2_id(kArbitraryFrameSinkId, local_frame2_id);
+  factory.Create(local_frame2_id);
 
   ResourceId ids[] = {11, 12, 13};
   SubmitCompositorFrameWithResources(ids, arraysize(ids), true, SurfaceId(),
-                                     &factory1, surface1_id);
+                                     &factory, surface1_id);
 
   CompositorFrame frame = aggregator_->Aggregate(surface1_id);
 
   RenderPass* render_pass = frame.render_pass_list.back().get();
 
   EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, render_pass->quad_list.back()->material);
 
   {
     std::unique_ptr<RenderPass> pass = RenderPass::Create();
     pass->id = RenderPassId(1, 1);
     SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
     sqs->opacity = 1.f;
     SurfaceDrawQuad* surface_quad =
         pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
-
     surface_quad->SetNew(sqs, gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1),
                          surface1_id);
     pass->copy_requests.push_back(CopyOutputRequest::CreateEmptyRequest());
 
     CompositorFrame frame;
     frame.render_pass_list.push_back(std::move(pass));
 
-    factory2.SubmitCompositorFrame(local_frame2_id, std::move(frame),
-                                   SurfaceFactory::DrawCallback());
+    factory.SubmitCompositorFrame(local_frame2_id, std::move(frame),
+                                  SurfaceFactory::DrawCallback());
   }
 
   frame = aggregator_->Aggregate(surface2_id);
   EXPECT_EQ(1u, frame.render_pass_list.size());
   render_pass = frame.render_pass_list.front().get();
 
   // Parent has copy request, so texture should not be drawn.
   EXPECT_EQ(DrawQuad::SOLID_COLOR, render_pass->quad_list.back()->material);
 
   frame = aggregator_->Aggregate(surface2_id);
   EXPECT_EQ(1u, frame.render_pass_list.size());
   render_pass = frame.render_pass_list.front().get();
 
   // Copy request has been executed earlier, so texture should be drawn.
   EXPECT_EQ(DrawQuad::TEXTURE_CONTENT,
             render_pass->quad_list.front()->material);
 
   aggregator_->set_output_is_secure(false);
 
   frame = aggregator_->Aggregate(surface2_id);
   render_pass = frame.render_pass_list.back().get();
 
   // Output is insecure, so texture should be drawn.
   EXPECT_EQ(DrawQuad::SOLID_COLOR, render_pass->quad_list.back()->material);
 
-  factory1.EvictSurface();
-  factory2.EvictSurface();
+  factory.Destroy(local_frame1_id);
+  factory.Destroy(local_frame2_id);
 }
 
 }  // namespace
 }  // namespace cc