[cc]Replace use of SurfaceFactory with CompositorFrameSinkSupport in tests

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>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/shared_bitmap_manager.h"
+#include "cc/surfaces/compositor_frame_sink_support.h"
 #include "cc/surfaces/local_surface_id_allocator.h"
 #include "cc/surfaces/surface.h"
-#include "cc/surfaces/surface_factory.h"
-#include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/test/fake_resource_provider.h"
 #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 {
 
 constexpr FrameSinkId kArbitraryRootFrameSinkId(1, 1);
-constexpr FrameSinkId kArbitraryChildFrameSinkId1(2, 2);
-constexpr FrameSinkId kArbitraryChildFrameSinkId2(3, 3);
+constexpr FrameSinkId kArbitraryFrameSinkId1(2, 2);
+constexpr FrameSinkId kArbitraryFrameSinkId2(3, 3);
 constexpr FrameSinkId kArbitraryMiddleFrameSinkId(4, 4);
+constexpr FrameSinkId kArbitraryReservedFrameSinkId(5, 5);
+constexpr FrameSinkId kArbitraryFrameSinkId3(6, 6);
 const base::UnguessableToken kArbitraryToken = base::UnguessableToken::Create();
+constexpr bool is_root = true;
+constexpr bool is_root_child = false;
+constexpr bool handles_frame_sink_id_invalidation = true;
+constexpr bool needs_sync_points = false;
 
 SurfaceId InvalidSurfaceId() {
   static SurfaceId invalid(FrameSinkId(),
                            LocalSurfaceId(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 LocalSurfaceId& id,
-                       const gfx::Rect& damage_rect) override {
-    last_local_surface_id_ = id;
-    last_damage_rect_ = damage_rect;
-  }
-
-  void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override {}
-
-  gfx::Rect last_damage_rect_;
-  LocalSurfaceId last_local_surface_id_;
-};
-
 class SurfaceAggregatorTest : public testing::Test {
  public:
   explicit SurfaceAggregatorTest(bool use_damage_rect)
-      : factory_(kArbitraryRootFrameSinkId, &manager_, &empty_client_),
+      : support_(nullptr,
+                 &manager_,
+                 kArbitraryRootFrameSinkId,
+                 is_root,
+                 handles_frame_sink_id_invalidation,
+                 needs_sync_points),
         aggregator_(&manager_, NULL, use_damage_rect) {}
 
   SurfaceAggregatorTest() : SurfaceAggregatorTest(false) {}
 
   void TearDown() override {
-    factory_.EvictSurface();
+    support_.EvictFrame();
     testing::Test::TearDown();
   }
 
  protected:
   SurfaceManager manager_;
-  EmptySurfaceFactoryClient empty_client_;
-  SurfaceFactory factory_;
+  CompositorFrameSinkSupport support_;
   SurfaceAggregator aggregator_;
 };
 
 TEST_F(SurfaceAggregatorTest, ValidSurfaceNoFrame) {
   LocalSurfaceId local_surface_id(7, base::UnguessableToken::Create());
   SurfaceId one_id(kArbitraryRootFrameSinkId, local_surface_id);
-  factory_.SubmitCompositorFrame(local_surface_id, CompositorFrame(),
-                                 SurfaceFactory::DrawCallback());
+  support_.SubmitCompositorFrame(local_surface_id, CompositorFrame());
 
   CompositorFrame frame = aggregator_.Aggregate(one_id);
   EXPECT_TRUE(frame.render_pass_list.empty());
 }
 
 class SurfaceAggregatorValidSurfaceTest : public SurfaceAggregatorTest {
  public:
   explicit SurfaceAggregatorValidSurfaceTest(bool use_damage_rect)
       : SurfaceAggregatorTest(use_damage_rect),
-        child_factory_(kArbitraryChildFrameSinkId1,
+        child_support_(nullptr,
                        &manager_,
-                       &empty_child_client_) {}
+                       kArbitraryReservedFrameSinkId,
+                       is_root_child,
+                       handles_frame_sink_id_invalidation,
+                       needs_sync_points) {}
   SurfaceAggregatorValidSurfaceTest()
       : SurfaceAggregatorValidSurfaceTest(false) {}
 
   void SetUp() override {
     SurfaceAggregatorTest::SetUp();
     root_local_surface_id_ = allocator_.GenerateId();
     root_surface_ = manager_.GetSurfaceForId(
-        SurfaceId(factory_.frame_sink_id(), root_local_surface_id_));
+        SurfaceId(support_.frame_sink_id(), root_local_surface_id_));
   }
 
   void TearDown() override {
-    child_factory_.EvictSurface();
+    child_support_.EvictFrame();
     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_surface_id_));
+        SurfaceId(support_.frame_sink_id(), root_local_surface_id_));
 
     TestPassesMatchExpectations(expected_passes, expected_pass_count,
                                 &aggregated_frame.render_pass_list);
 
     // Ensure no duplicate pass ids output.
     std::set<int> used_passes;
     for (const auto& pass : aggregated_frame.render_pass_list) {
       EXPECT_TRUE(used_passes.insert(pass->id).second);
     }
 
     EXPECT_EQ(expected_surface_count,
               aggregator_.previous_contained_surfaces().size());
     for (size_t i = 0; i < expected_surface_count; i++) {
       EXPECT_TRUE(
           aggregator_.previous_contained_surfaces().find(surface_ids[i]) !=
           aggregator_.previous_contained_surfaces().end());
     }
   }
 
-  void SubmitPassListAsFrame(SurfaceFactory* factory,
+  void SubmitPassListAsFrame(CompositorFrameSinkSupport* support,
                              const LocalSurfaceId& local_surface_id,
                              RenderPassList* pass_list) {
     CompositorFrame frame;
     pass_list->swap(frame.render_pass_list);
 
-    factory->SubmitCompositorFrame(local_surface_id, std::move(frame),
-                                   SurfaceFactory::DrawCallback());
+    support->SubmitCompositorFrame(local_surface_id, std::move(frame));
   }
 
-  void SubmitCompositorFrame(SurfaceFactory* factory,
+  void SubmitCompositorFrame(CompositorFrameSinkSupport* support,
                              test::Pass* passes,
                              size_t pass_count,
                              const LocalSurfaceId& local_surface_id) {
     RenderPassList pass_list;
     AddPasses(&pass_list, gfx::Rect(SurfaceSize()), passes, pass_count);
-    SubmitPassListAsFrame(factory, local_surface_id, &pass_list);
+    SubmitPassListAsFrame(support, local_surface_id, &pass_list);
   }
 
   void QueuePassAsFrame(std::unique_ptr<RenderPass> pass,
                         const LocalSurfaceId& local_surface_id,
-                        SurfaceFactory* factory) {
+                        CompositorFrameSinkSupport* support) {
     CompositorFrame child_frame;
     child_frame.render_pass_list.push_back(std::move(pass));
 
-    factory->SubmitCompositorFrame(local_surface_id, std::move(child_frame),
-                                   SurfaceFactory::DrawCallback());
+    support->SubmitCompositorFrame(local_surface_id, std::move(child_frame));
   }
 
  protected:
   LocalSurfaceId root_local_surface_id_;
   Surface* root_surface_;
   LocalSurfaceIdAllocator allocator_;
-  EmptySurfaceFactoryClient empty_child_client_;
-  SurfaceFactory child_factory_;
+  CompositorFrameSinkSupport child_support_;
   LocalSurfaceIdAllocator child_allocator_;
 };
 
 // Tests that a very simple frame containing only two solid color quads makes it
 // through the aggregator correctly.
 TEST_F(SurfaceAggregatorValidSurfaceTest, SimpleFrame) {
   test::Quad quads[] = {test::Quad::SolidColorQuad(SK_ColorRED),
                         test::Quad::SolidColorQuad(SK_ColorBLUE)};
   test::Pass passes[] = {test::Pass(quads, arraysize(quads))};
 
-  SubmitCompositorFrame(&factory_, passes, arraysize(passes),
+  SubmitCompositorFrame(&support_, passes, arraysize(passes),
                         root_local_surface_id_);
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   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_surface_id_, empty_client_.last_local_surface_id_);
+  EXPECT_EQ(gfx::Rect(SurfaceSize()), support_.last_damage_rect());
+  EXPECT_EQ(root_local_surface_id_, support_.last_local_surface_id());
 }
 
 TEST_F(SurfaceAggregatorValidSurfaceTest, OpacityCopied) {
-  SurfaceFactory embedded_factory(kArbitraryChildFrameSinkId1, &manager_,
-                                  &empty_client_);
+  CompositorFrameSinkSupport embedded_support(
+      nullptr, &manager_, kArbitraryFrameSinkId1, is_root,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   LocalSurfaceId embedded_local_surface_id = allocator_.GenerateId();
-  SurfaceId embedded_surface_id(embedded_factory.frame_sink_id(),
+  SurfaceId embedded_surface_id(embedded_support.frame_sink_id(),
                                 embedded_local_surface_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,
+  SubmitCompositorFrame(&embedded_support, embedded_passes,
                         arraysize(embedded_passes), embedded_local_surface_id);
 
   test::Quad quads[] = {
       test::Quad::SurfaceQuad(embedded_surface_id, InvalidSurfaceId(), .5f)};
   test::Pass passes[] = {test::Pass(quads, arraysize(quads))};
 
-  SubmitCompositorFrame(&factory_, passes, arraysize(passes),
+  SubmitCompositorFrame(&support_, passes, arraysize(passes),
                         root_local_surface_id_);
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_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();
+  embedded_support.EvictFrame();
 }
 
 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]), 1),
                          test::Pass(quads[1], arraysize(quads[1]), 2)};
 
-  SubmitCompositorFrame(&factory_, passes, arraysize(passes),
+  SubmitCompositorFrame(&support_, passes, arraysize(passes),
                         root_local_surface_id_);
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   SurfaceId ids[] = {root_surface_id};
 
   AggregateAndVerify(passes, arraysize(passes), ids, arraysize(ids));
 }
 
 // Ensure that the render pass ID map properly keeps and deletes entries.
 TEST_F(SurfaceAggregatorValidSurfaceTest, MultiPassDeallocation) {
   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]), 2),
                          test::Pass(quads[1], arraysize(quads[1]), 1)};
 
-  SubmitCompositorFrame(&factory_, passes, arraysize(passes),
+  SubmitCompositorFrame(&support_, passes, arraysize(passes),
                         root_local_surface_id_);
 
-  SurfaceId surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId surface_id(support_.frame_sink_id(), root_local_surface_id_);
 
   CompositorFrame aggregated_frame;
   aggregated_frame = aggregator_.Aggregate(surface_id);
   auto id0 = aggregated_frame.render_pass_list[0]->id;
   auto id1 = aggregated_frame.render_pass_list[1]->id;
   EXPECT_NE(id1, id0);
 
   // Aggregated RenderPass ids should remain the same between frames.
   aggregated_frame = aggregator_.Aggregate(surface_id);
   EXPECT_EQ(id0, aggregated_frame.render_pass_list[0]->id);
   EXPECT_EQ(id1, aggregated_frame.render_pass_list[1]->id);
 
   test::Pass passes2[] = {test::Pass(quads[0], arraysize(quads[0]), 3),
                           test::Pass(quads[1], arraysize(quads[1]), 1)};
 
-  SubmitCompositorFrame(&factory_, passes2, arraysize(passes2),
+  SubmitCompositorFrame(&support_, passes2, arraysize(passes2),
                         root_local_surface_id_);
 
   // The RenderPass that still exists should keep the same ID.
   aggregated_frame = aggregator_.Aggregate(surface_id);
   auto id2 = aggregated_frame.render_pass_list[0]->id;
   EXPECT_NE(id2, id1);
   EXPECT_NE(id2, id0);
   EXPECT_EQ(id1, aggregated_frame.render_pass_list[1]->id);
 
-  SubmitCompositorFrame(&factory_, passes, arraysize(passes),
+  SubmitCompositorFrame(&support_, passes, arraysize(passes),
                         root_local_surface_id_);
 
   // |id1| didn't exist in the previous frame, so it should be
   // mapped to a new ID.
   aggregated_frame = aggregator_.Aggregate(surface_id);
   auto id3 = aggregated_frame.render_pass_list[0]->id;
   EXPECT_NE(id3, id2);
   EXPECT_NE(id3, id1);
   EXPECT_NE(id3, id0);
   EXPECT_EQ(id1, aggregated_frame.render_pass_list[1]->id);
 }
 
 // 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(kArbitraryChildFrameSinkId1, &manager_,
-                                  &empty_client_);
+  CompositorFrameSinkSupport embedded_support(
+      nullptr, &manager_, kArbitraryFrameSinkId1, is_root,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   LocalSurfaceId embedded_local_surface_id = allocator_.GenerateId();
-  SurfaceId embedded_surface_id(embedded_factory.frame_sink_id(),
+  SurfaceId embedded_surface_id(embedded_support.frame_sink_id(),
                                 embedded_local_surface_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,
+  SubmitCompositorFrame(&embedded_support, embedded_passes,
                         arraysize(embedded_passes), embedded_local_surface_id);
 
   test::Quad root_quads[] = {
       test::Quad::SolidColorQuad(SK_ColorWHITE),
       test::Quad::SurfaceQuad(embedded_surface_id, InvalidSurfaceId(), 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),
+  SubmitCompositorFrame(&support_, root_passes, arraysize(root_passes),
                         root_local_surface_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_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   SurfaceId ids[] = {root_surface_id, embedded_surface_id};
   AggregateAndVerify(
       expected_passes, arraysize(expected_passes), ids, arraysize(ids));
 
-  embedded_factory.EvictSurface();
+  embedded_support.EvictFrame();
 }
 
 // This test verifies that in the absence of a primary Surface,
 // SurfaceAggregator will embed a fallback Surface, if available. If the primary
 // Surface is available, though, the fallback will not be used.
 TEST_F(SurfaceAggregatorValidSurfaceTest, FallbackSurfaceReference) {
-  SurfaceFactory primary_child_factory(kArbitraryChildFrameSinkId1, &manager_,
-                                       &empty_client_);
+  CompositorFrameSinkSupport primary_child_support(
+      nullptr, &manager_, kArbitraryFrameSinkId1, is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   LocalSurfaceId primary_child_local_surface_id = allocator_.GenerateId();
-  SurfaceId primary_child_surface_id(primary_child_factory.frame_sink_id(),
+  SurfaceId primary_child_surface_id(primary_child_support.frame_sink_id(),
                                      primary_child_local_surface_id);
 
-  SurfaceFactory fallback_child_factory(kArbitraryChildFrameSinkId2, &manager_,
-                                        &empty_client_);
+  CompositorFrameSinkSupport fallback_child_support(
+      nullptr, &manager_, kArbitraryFrameSinkId2, is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   LocalSurfaceId fallback_child_local_surface_id = allocator_.GenerateId();
-  SurfaceId fallback_child_surface_id(fallback_child_factory.frame_sink_id(),
+  SurfaceId fallback_child_surface_id(fallback_child_support.frame_sink_id(),
                                       fallback_child_local_surface_id);
 
   test::Quad fallback_child_quads[] = {test::Quad::SolidColorQuad(SK_ColorRED)};
   test::Pass fallback_child_passes[] = {
       test::Pass(fallback_child_quads, arraysize(fallback_child_quads))};
 
   // Submit a CompositorFrame to the fallback Surface containing a red
   // SolidColorDrawQuad.
-  SubmitCompositorFrame(&fallback_child_factory, fallback_child_passes,
+  SubmitCompositorFrame(&fallback_child_support, fallback_child_passes,
                         arraysize(fallback_child_passes),
                         fallback_child_local_surface_id);
 
   // Try to embed |primary_child_surface_id| and if unavailabe, embed
   // |fallback_child_surface_id|.
   test::Quad root_quads[] = {test::Quad::SurfaceQuad(
       primary_child_surface_id, fallback_child_surface_id, 1.f)};
   test::Pass root_passes[] = {test::Pass(root_quads, arraysize(root_quads))};
 
-  SubmitCompositorFrame(&factory_, root_passes, arraysize(root_passes),
+  SubmitCompositorFrame(&support_, root_passes, arraysize(root_passes),
                         root_local_surface_id_);
 
   // There is no CompositorFrame submitted to |primary_child_surface_id| and so
   // |fallback_child_surface_id| will be embedded and we should see a red
   // SolidColorDrawQuad.
   test::Quad expected_quads1[] = {test::Quad::SolidColorQuad(SK_ColorRED)};
   test::Pass expected_passes1[] = {
       test::Pass(expected_quads1, arraysize(expected_quads1))};
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   SurfaceId ids[] = {root_surface_id, primary_child_surface_id,
                      fallback_child_surface_id};
   AggregateAndVerify(expected_passes1, arraysize(expected_passes1), ids,
                      arraysize(ids));
 
   test::Quad primary_child_quads[] = {
       test::Quad::SolidColorQuad(SK_ColorGREEN)};
   test::Pass primary_child_passes[] = {
       test::Pass(primary_child_quads, arraysize(primary_child_quads))};
 
   // Submit a CompositorFrame to the primary Surface containing a green
   // SolidColorDrawQuad.
-  SubmitCompositorFrame(&primary_child_factory, primary_child_passes,
+  SubmitCompositorFrame(&primary_child_support, primary_child_passes,
                         arraysize(primary_child_passes),
                         primary_child_local_surface_id);
 
   // Now that the primary Surface has a CompositorFrame, we expect
   // SurfaceAggregator to embed the primary Surface, and drop the fallback
   // Surface.
   test::Quad expected_quads2[] = {test::Quad::SolidColorQuad(SK_ColorGREEN)};
   test::Pass expected_passes2[] = {
       test::Pass(expected_quads2, arraysize(expected_quads2))};
   AggregateAndVerify(expected_passes2, arraysize(expected_passes2), ids,
                      arraysize(ids));
 
-  primary_child_factory.EvictSurface();
-  fallback_child_factory.EvictSurface();
+  primary_child_support.EvictFrame();
+  fallback_child_support.EvictFrame();
 }
 
 // This test verifies that in the presence of both primary Surface and fallback
 // Surface, the fallback will not be used.
 TEST_F(SurfaceAggregatorValidSurfaceTest, FallbackSurfaceReferenceWithPrimary) {
-  SurfaceFactory primary_child_factory(kArbitraryChildFrameSinkId1, &manager_,
-                                       &empty_client_);
+  CompositorFrameSinkSupport primary_child_support(
+      nullptr, &manager_, kArbitraryFrameSinkId1, is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   LocalSurfaceId primary_child_local_surface_id = allocator_.GenerateId();
-  SurfaceId primary_child_surface_id(primary_child_factory.frame_sink_id(),
+  SurfaceId primary_child_surface_id(primary_child_support.frame_sink_id(),
                                      primary_child_local_surface_id);
   test::Quad primary_child_quads[] = {
       test::Quad::SolidColorQuad(SK_ColorGREEN)};
   test::Pass primary_child_passes[] = {
       test::Pass(primary_child_quads, arraysize(primary_child_quads))};
 
   // Submit a CompositorFrame to the primary Surface containing a green
   // SolidColorDrawQuad.
-  SubmitCompositorFrame(&primary_child_factory, primary_child_passes,
+  SubmitCompositorFrame(&primary_child_support, primary_child_passes,
                         arraysize(primary_child_passes),
                         primary_child_local_surface_id);
 
-  SurfaceFactory fallback_child_factory(kArbitraryChildFrameSinkId2, &manager_,
-                                        &empty_client_);
+  CompositorFrameSinkSupport fallback_child_support(
+      nullptr, &manager_, kArbitraryFrameSinkId2, is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   LocalSurfaceId fallback_child_local_surface_id = allocator_.GenerateId();
-  SurfaceId fallback_child_surface_id(fallback_child_factory.frame_sink_id(),
+  SurfaceId fallback_child_surface_id(fallback_child_support.frame_sink_id(),
                                       fallback_child_local_surface_id);
 
   test::Quad fallback_child_quads[] = {test::Quad::SolidColorQuad(SK_ColorRED)};
   test::Pass fallback_child_passes[] = {
       test::Pass(fallback_child_quads, arraysize(fallback_child_quads))};
 
   // Submit a CompositorFrame to the fallback Surface containing a red
   // SolidColorDrawQuad.
-  SubmitCompositorFrame(&fallback_child_factory, fallback_child_passes,
+  SubmitCompositorFrame(&fallback_child_support, fallback_child_passes,
                         arraysize(fallback_child_passes),
                         fallback_child_local_surface_id);
 
   // Try to embed |primary_child_surface_id| and if unavailabe, embed
   // |fallback_child_surface_id|.
   test::Quad root_quads[] = {test::Quad::SurfaceQuad(
       primary_child_surface_id, fallback_child_surface_id, 1.f)};
   test::Pass root_passes[] = {test::Pass(root_quads, arraysize(root_quads))};
 
-  SubmitCompositorFrame(&factory_, root_passes, arraysize(root_passes),
+  SubmitCompositorFrame(&support_, root_passes, arraysize(root_passes),
                         root_local_surface_id_);
 
   // The CompositorFrame is submitted to |primary_child_surface_id|, so
   // |fallback_child_surface_id| will not be used and we should see a green
   // SolidColorDrawQuad.
   test::Quad expected_quads1[] = {test::Quad::SolidColorQuad(SK_ColorGREEN)};
   test::Pass expected_passes1[] = {
       test::Pass(expected_quads1, arraysize(expected_quads1))};
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   SurfaceId ids[] = {root_surface_id, primary_child_surface_id,
                      fallback_child_surface_id};
   AggregateAndVerify(expected_passes1, arraysize(expected_passes1), ids,
                      arraysize(ids));
 
-  primary_child_factory.EvictSurface();
-  fallback_child_factory.EvictSurface();
+  primary_child_support.EvictFrame();
+  fallback_child_support.EvictFrame();
 }
 
 TEST_F(SurfaceAggregatorValidSurfaceTest, CopyRequest) {
-  SurfaceFactory embedded_factory(kArbitraryChildFrameSinkId1, &manager_,
-                                  &empty_client_);
+  CompositorFrameSinkSupport embedded_support(
+      nullptr, &manager_, kArbitraryFrameSinkId1, is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   LocalSurfaceId embedded_local_surface_id = allocator_.GenerateId();
-  SurfaceId embedded_surface_id(embedded_factory.frame_sink_id(),
+  SurfaceId embedded_surface_id(embedded_support.frame_sink_id(),
                                 embedded_local_surface_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,
+  SubmitCompositorFrame(&embedded_support, embedded_passes,
                         arraysize(embedded_passes), embedded_local_surface_id);
   std::unique_ptr<CopyOutputRequest> copy_request(
       CopyOutputRequest::CreateEmptyRequest());
   CopyOutputRequest* copy_request_ptr = copy_request.get();
-  embedded_factory.RequestCopyOfSurface(std::move(copy_request));
+  embedded_support.RequestCopyOfSurface(std::move(copy_request));
 
   test::Quad root_quads[] = {
       test::Quad::SolidColorQuad(SK_ColorWHITE),
       test::Quad::SurfaceQuad(embedded_surface_id, InvalidSurfaceId(), 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),
+  SubmitCompositorFrame(&support_, root_passes, arraysize(root_passes),
                         root_local_surface_id_);
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
   test::Quad expected_quads[] = {
       test::Quad::SolidColorQuad(SK_ColorWHITE),
       test::Quad::RenderPassQuad(aggregated_frame.render_pass_list[0]->id),
       test::Quad::SolidColorQuad(SK_ColorBLACK)};
   test::Pass expected_passes[] = {
       test::Pass(embedded_quads, arraysize(embedded_quads)),
       test::Pass(expected_quads, arraysize(expected_quads))};
   TestPassesMatchExpectations(expected_passes, arraysize(expected_passes),
                               &aggregated_frame.render_pass_list);
   ASSERT_EQ(2u, aggregated_frame.render_pass_list.size());
   ASSERT_EQ(1u, aggregated_frame.render_pass_list[0]->copy_requests.size());
   DCHECK_EQ(copy_request_ptr,
             aggregated_frame.render_pass_list[0]->copy_requests[0].get());
 
   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();
+  embedded_support.EvictFrame();
 }
 
 // Root surface may contain copy requests.
 TEST_F(SurfaceAggregatorValidSurfaceTest, RootCopyRequest) {
-  SurfaceFactory embedded_factory(kArbitraryChildFrameSinkId1, &manager_,
-                                  &empty_client_);
+  CompositorFrameSinkSupport embedded_support(
+      nullptr, &manager_, kArbitraryFrameSinkId2, is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   LocalSurfaceId embedded_local_surface_id = allocator_.GenerateId();
-  SurfaceId embedded_surface_id(embedded_factory.frame_sink_id(),
+  SurfaceId embedded_surface_id(embedded_support.frame_sink_id(),
                                 embedded_local_surface_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,
+  SubmitCompositorFrame(&embedded_support, embedded_passes,
                         arraysize(embedded_passes), embedded_local_surface_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, InvalidSurfaceId(), 1.f),
       test::Quad::SolidColorQuad(SK_ColorBLACK)};
   test::Quad root_quads2[] = {test::Quad::SolidColorQuad(SK_ColorRED)};
   test::Pass root_passes[] = {
       test::Pass(root_quads, arraysize(root_quads), 1),
       test::Pass(root_quads2, arraysize(root_quads2), 2)};
   {
     CompositorFrame frame;
     AddPasses(&frame.render_pass_list, gfx::Rect(SurfaceSize()), root_passes,
               arraysize(root_passes));
     frame.render_pass_list[0]->copy_requests.push_back(std::move(copy_request));
     frame.render_pass_list[1]->copy_requests.push_back(
         std::move(copy_request2));
 
-    factory_.SubmitCompositorFrame(root_local_surface_id_, std::move(frame),
-                                   SurfaceFactory::DrawCallback());
+    support_.SubmitCompositorFrame(root_local_surface_id_, std::move(frame));
   }
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_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)),
       test::Pass(root_quads2, arraysize(root_quads2))};
   TestPassesMatchExpectations(expected_passes, arraysize(expected_passes),
                               &aggregated_frame.render_pass_list);
@@ skipping 15 matching lines @@
   }
 
   // Ensure copy requests have been removed from root surface.
   const CompositorFrame& original_frame =
       manager_.GetSurfaceForId(root_surface_id)->GetActiveFrame();
   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();
+  embedded_support.EvictFrame();
 }
 
 TEST_F(SurfaceAggregatorValidSurfaceTest, UnreferencedSurface) {
-  SurfaceFactory embedded_factory(kArbitraryChildFrameSinkId1, &manager_,
-                                  &empty_client_);
-  SurfaceFactory parent_factory(kArbitraryRootFrameSinkId, &manager_,
-                                &empty_client_);
+  CompositorFrameSinkSupport embedded_support(
+      nullptr, &manager_, kArbitraryFrameSinkId1, is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
+  CompositorFrameSinkSupport parent_support(
+      nullptr, &manager_, kArbitraryFrameSinkId2, is_root,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   LocalSurfaceId embedded_local_surface_id = allocator_.GenerateId();
-  SurfaceId embedded_surface_id(embedded_factory.frame_sink_id(),
+  SurfaceId embedded_surface_id(embedded_support.frame_sink_id(),
                                 embedded_local_surface_id);
-  SurfaceId nonexistent_surface_id(factory_.frame_sink_id(),
+  SurfaceId nonexistent_surface_id(support_.frame_sink_id(),
                                    allocator_.GenerateId());
 
   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,
+  SubmitCompositorFrame(&embedded_support, embedded_passes,
                         arraysize(embedded_passes), embedded_local_surface_id);
   std::unique_ptr<CopyOutputRequest> copy_request(
       CopyOutputRequest::CreateEmptyRequest());
   CopyOutputRequest* copy_request_ptr = copy_request.get();
-  embedded_factory.RequestCopyOfSurface(std::move(copy_request));
+  embedded_support.RequestCopyOfSurface(std::move(copy_request));
 
   LocalSurfaceId parent_local_surface_id = allocator_.GenerateId();
-  SurfaceId parent_surface_id(parent_factory.frame_sink_id(),
+  SurfaceId parent_surface_id(parent_support.frame_sink_id(),
                               parent_local_surface_id);
 
   test::Quad parent_quads[] = {
       test::Quad::SolidColorQuad(SK_ColorGRAY),
       test::Quad::SurfaceQuad(embedded_surface_id, InvalidSurfaceId(), 1.f),
       test::Quad::SolidColorQuad(SK_ColorLTGRAY)};
   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_surface_id,
-                                         std::move(frame),
-                                         SurfaceFactory::DrawCallback());
+    parent_support.SubmitCompositorFrame(parent_local_surface_id,
+                                         std::move(frame));
   }
 
   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));
 
     frame.metadata.referenced_surfaces.push_back(parent_surface_id);
     // Reference to Surface ID of a Surface that doesn't exist should be
     // included in previous_contained_surfaces, but otherwise ignored.
     frame.metadata.referenced_surfaces.push_back(nonexistent_surface_id);
 
-    factory_.SubmitCompositorFrame(root_local_surface_id_, std::move(frame),
-                                   SurfaceFactory::DrawCallback());
+    support_.SubmitCompositorFrame(root_local_surface_id_, std::move(frame));
   }
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
   // First pass should come from surface that had a copy request but was not
   // referenced directly. The second pass comes from the root surface.
   // parent_quad should be ignored because it is neither referenced through a
   // SurfaceDrawQuad nor has a copy request on it.
   test::Pass expected_passes[] = {
       test::Pass(embedded_quads, arraysize(embedded_quads)),
       test::Pass(root_quads, arraysize(root_quads))};
   TestPassesMatchExpectations(expected_passes, arraysize(expected_passes),
                               &aggregated_frame.render_pass_list);
   ASSERT_EQ(2u, aggregated_frame.render_pass_list.size());
   ASSERT_EQ(1u, aggregated_frame.render_pass_list[0]->copy_requests.size());
   DCHECK_EQ(copy_request_ptr,
             aggregated_frame.render_pass_list[0]->copy_requests[0].get());
 
   SurfaceId surface_ids[] = {
-      SurfaceId(factory_.frame_sink_id(), root_local_surface_id_),
+      SurfaceId(support_.frame_sink_id(), root_local_surface_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();
+  embedded_support.EvictFrame();
+  parent_support.EvictFrame();
 }
 
 // This tests referencing a surface that has multiple render passes.
 TEST_F(SurfaceAggregatorValidSurfaceTest, MultiPassSurfaceReference) {
   LocalSurfaceId embedded_local_surface_id = child_allocator_.GenerateId();
-  SurfaceId embedded_surface_id(child_factory_.frame_sink_id(),
+  SurfaceId embedded_surface_id(child_support_.frame_sink_id(),
                                 embedded_local_surface_id);
 
   int pass_ids[] = {1, 2, 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]),
       test::Pass(embedded_quads[1], arraysize(embedded_quads[1]), pass_ids[1]),
       test::Pass(embedded_quads[2], arraysize(embedded_quads[2]), pass_ids[2])};
 
-  SubmitCompositorFrame(&child_factory_, embedded_passes,
+  SubmitCompositorFrame(&child_support_, embedded_passes,
                         arraysize(embedded_passes), embedded_local_surface_id);
 
   test::Quad root_quads[][2] = {
       {test::Quad::SolidColorQuad(5), test::Quad::SolidColorQuad(6)},
       {test::Quad::SurfaceQuad(embedded_surface_id, InvalidSurfaceId(), 1.f),
        test::Quad::RenderPassQuad(pass_ids[0])},
       {test::Quad::SolidColorQuad(7), test::Quad::RenderPassQuad(pass_ids[1])}};
   test::Pass root_passes[] = {
       test::Pass(root_quads[0], arraysize(root_quads[0]), pass_ids[0]),
       test::Pass(root_quads[1], arraysize(root_quads[1]), pass_ids[1]),
       test::Pass(root_quads[2], arraysize(root_quads[2]), pass_ids[2])};
 
-  SubmitCompositorFrame(&factory_, root_passes, arraysize(root_passes),
+  SubmitCompositorFrame(&support_, root_passes, arraysize(root_passes),
                         root_local_surface_id_);
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
   const RenderPassList& aggregated_pass_list =
       aggregated_frame.render_pass_list;
 
   ASSERT_EQ(5u, aggregated_pass_list.size());
   int actual_pass_ids[] = {
       aggregated_pass_list[0]->id, aggregated_pass_list[1]->id,
       aggregated_pass_list[2]->id, aggregated_pass_list[3]->id,
       aggregated_pass_list[4]->id};
@@ skipping 91 matching lines @@
 
 // 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(), InvalidSurfaceId(), 1.f),
       test::Quad::SolidColorQuad(SK_ColorBLUE)};
   test::Pass passes[] = {test::Pass(quads, arraysize(quads))};
 
-  SubmitCompositorFrame(&factory_, passes, arraysize(passes),
+  SubmitCompositorFrame(&support_, passes, arraysize(passes),
                         root_local_surface_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_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   SurfaceId ids[] = {root_surface_id, InvalidSurfaceId()};
 
   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) {
   LocalSurfaceId empty_local_surface_id = allocator_.GenerateId();
-  SurfaceId surface_with_no_frame_id(factory_.frame_sink_id(),
+  SurfaceId surface_with_no_frame_id(support_.frame_sink_id(),
                                      empty_local_surface_id);
 
   test::Quad quads[] = {test::Quad::SolidColorQuad(SK_ColorGREEN),
                         test::Quad::SurfaceQuad(surface_with_no_frame_id,
                                                 InvalidSurfaceId(), 1.f),
                         test::Quad::SolidColorQuad(SK_ColorBLUE)};
   test::Pass passes[] = {test::Pass(quads, arraysize(quads))};
 
-  SubmitCompositorFrame(&factory_, passes, arraysize(passes),
+  SubmitCompositorFrame(&support_, passes, arraysize(passes),
                         root_local_surface_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_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   SurfaceId ids[] = {root_surface_id, surface_with_no_frame_id};
   AggregateAndVerify(
       expected_passes, arraysize(expected_passes), ids, arraysize(ids));
 }
 
 // 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_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   test::Quad quads[] = {
       test::Quad::SurfaceQuad(root_surface_id, InvalidSurfaceId(), 1.f),
       test::Quad::SolidColorQuad(SK_ColorYELLOW)};
   test::Pass passes[] = {test::Pass(quads, arraysize(quads))};
 
-  SubmitCompositorFrame(&factory_, passes, arraysize(passes),
+  SubmitCompositorFrame(&support_, passes, arraysize(passes),
                         root_local_surface_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) {
   LocalSurfaceId child_local_surface_id = allocator_.GenerateId();
-  SurfaceId child_surface_id(child_factory_.frame_sink_id(),
+  SurfaceId child_surface_id(child_support_.frame_sink_id(),
                              child_local_surface_id);
 
   test::Quad parent_quads[] = {
       test::Quad::SolidColorQuad(SK_ColorBLUE),
       test::Quad::SurfaceQuad(child_surface_id, InvalidSurfaceId(), 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),
+  SubmitCompositorFrame(&support_, parent_passes, arraysize(parent_passes),
                         root_local_surface_id_);
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   test::Quad child_quads[] = {
       test::Quad::SolidColorQuad(SK_ColorGREEN),
       test::Quad::SurfaceQuad(root_surface_id, InvalidSurfaceId(), 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(&child_support_, child_passes, arraysize(child_passes),
                         child_local_surface_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));
 }
 
 // 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) {
   LocalSurfaceId child_local_surface_id = allocator_.GenerateId();
-  SurfaceId child_surface_id(child_factory_.frame_sink_id(),
+  SurfaceId child_surface_id(child_support_.frame_sink_id(),
                              child_local_surface_id);
 
   int child_pass_id[] = {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,
+  SubmitCompositorFrame(&child_support_, surface_passes,
                         arraysize(surface_passes), child_local_surface_id);
 
   // Pass IDs from the parent surface may collide with ones from the child.
   int parent_pass_id[] = {3, 2};
   test::Quad parent_quad[][1] = {
       {test::Quad::SurfaceQuad(child_surface_id, InvalidSurfaceId(), 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])};
 
-  SubmitCompositorFrame(&factory_, parent_passes, arraysize(parent_passes),
+  SubmitCompositorFrame(&support_, parent_passes, arraysize(parent_passes),
                         root_local_surface_id_);
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
   const RenderPassList& aggregated_pass_list =
       aggregated_frame.render_pass_list;
 
   ASSERT_EQ(3u, aggregated_pass_list.size());
   int actual_pass_ids[] = {aggregated_pass_list[0]->id,
                            aggregated_pass_list[1]->id,
                            aggregated_pass_list[2]->id};
   // Make sure the aggregated frame's pass IDs are all unique.
@@ skipping 71 matching lines @@
 TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateSharedQuadStateProperties) {
   const SkBlendMode blend_modes[] = {
       SkBlendMode::kClear,    // 0
       SkBlendMode::kSrc,      // 1
       SkBlendMode::kDst,      // 2
       SkBlendMode::kSrcOver,  // 3
       SkBlendMode::kDstOver,  // 4
       SkBlendMode::kSrcIn,    // 5
       SkBlendMode::kDstIn,    // 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_);
+  CompositorFrameSinkSupport grandchild_support(
+      nullptr, &manager_, kArbitraryFrameSinkId1, is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
+  CompositorFrameSinkSupport child_one_support(
+      nullptr, &manager_, kArbitraryFrameSinkId2, is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
+  CompositorFrameSinkSupport child_two_support(
+      nullptr, &manager_, kArbitraryFrameSinkId3, is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   int pass_id = 1;
   LocalSurfaceId grandchild_local_surface_id = allocator_.GenerateId();
-  SurfaceId grandchild_surface_id(grandchild_factory.frame_sink_id(),
+  SurfaceId grandchild_surface_id(grandchild_support.frame_sink_id(),
                                   grandchild_local_surface_id);
-  grandchild_factory.SubmitCompositorFrame(grandchild_local_surface_id,
-                                           CompositorFrame(),
-                                           SurfaceFactory::DrawCallback());
+  grandchild_support.SubmitCompositorFrame(grandchild_local_surface_id,
+                                           CompositorFrame());
   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_surface_id,
-                   &grandchild_factory);
+                   &grandchild_support);
 
   LocalSurfaceId child_one_local_surface_id = allocator_.GenerateId();
-  SurfaceId child_one_surface_id(child_one_factory.frame_sink_id(),
+  SurfaceId child_one_surface_id(child_one_support.frame_sink_id(),
                                  child_one_local_surface_id);
-  child_one_factory.SubmitCompositorFrame(child_one_local_surface_id,
-                                          CompositorFrame(),
-                                          SurfaceFactory::DrawCallback());
+  child_one_support.SubmitCompositorFrame(child_one_local_surface_id,
+                                          CompositorFrame());
 
   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,
       SurfaceDrawQuadType::PRIMARY, nullptr);
   AddSolidColorQuadWithBlendMode(
       SurfaceSize(), child_one_pass.get(), blend_modes[3]);
   QueuePassAsFrame(std::move(child_one_pass), child_one_local_surface_id,
-                   &child_one_factory);
+                   &child_one_support);
 
   LocalSurfaceId child_two_local_surface_id = allocator_.GenerateId();
-  SurfaceId child_two_surface_id(child_two_factory.frame_sink_id(),
+  SurfaceId child_two_surface_id(child_two_support.frame_sink_id(),
                                  child_two_local_surface_id);
-  child_two_factory.SubmitCompositorFrame(child_two_local_surface_id,
-                                          CompositorFrame(),
-                                          SurfaceFactory::DrawCallback());
+  child_two_support.SubmitCompositorFrame(child_two_local_surface_id,
+                                          CompositorFrame());
 
   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_surface_id,
-                   &child_two_factory);
+                   &child_two_support);
 
   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,
                                  SurfaceDrawQuadType::PRIMARY, nullptr);
   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,
                                  SurfaceDrawQuadType::PRIMARY, nullptr);
   AddSolidColorQuadWithBlendMode(
       SurfaceSize(), root_pass.get(), blend_modes[6]);
 
-  QueuePassAsFrame(std::move(root_pass), root_local_surface_id_, &factory_);
+  QueuePassAsFrame(std::move(root_pass), root_local_surface_id_, &support_);
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_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();
+  grandchild_support.EvictFrame();
+  child_one_support.EvictFrame();
+  child_two_support.EvictFrame();
 }
 
 // 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_);
+  CompositorFrameSinkSupport middle_support(
+      nullptr, &manager_, kArbitraryMiddleFrameSinkId, is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   // Innermost child surface.
   LocalSurfaceId child_local_surface_id = allocator_.GenerateId();
-  SurfaceId child_surface_id(child_factory_.frame_sink_id(),
+  SurfaceId child_surface_id(child_support_.frame_sink_id(),
                              child_local_surface_id);
   {
     int child_pass_id[] = {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_surface_id,
-                                         std::move(child_frame),
-                                         SurfaceFactory::DrawCallback());
+    child_support_.SubmitCompositorFrame(child_local_surface_id,
+                                         std::move(child_frame));
   }
 
   // Middle child surface.
   LocalSurfaceId middle_local_surface_id = allocator_.GenerateId();
-  SurfaceId middle_surface_id(middle_factory.frame_sink_id(),
+  SurfaceId middle_surface_id(middle_support.frame_sink_id(),
                               middle_local_surface_id);
   {
     test::Quad middle_quads[] = {
         test::Quad::SurfaceQuad(child_surface_id, InvalidSurfaceId(), 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_surface_id,
-                                         std::move(middle_frame),
-                                         SurfaceFactory::DrawCallback());
+    middle_support.SubmitCompositorFrame(middle_local_surface_id,
+                                         std::move(middle_frame));
   }
 
   // Root surface.
   test::Quad secondary_quads[] = {
       test::Quad::SolidColorQuad(1),
       test::Quad::SurfaceQuad(middle_surface_id, InvalidSurfaceId(), 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))};
 
   CompositorFrame root_frame;
   AddPasses(&root_frame.render_pass_list, gfx::Rect(SurfaceSize()), root_passes,
             arraysize(root_passes));
 
   root_frame.render_pass_list[0]
       ->shared_quad_state_list.front()
       ->quad_to_target_transform.Translate(0, 7);
   root_frame.render_pass_list[0]
       ->shared_quad_state_list.ElementAt(1)
       ->quad_to_target_transform.Translate(0, 10);
   root_frame.render_pass_list[0]->quad_list.ElementAt(1)->visible_rect =
       gfx::Rect(0, 0, 8, 100);
 
   root_frame.render_pass_list[0]->transform_to_root_target.Translate(10, 5);
 
-  factory_.SubmitCompositorFrame(root_local_surface_id_, std::move(root_frame),
-                                 SurfaceFactory::DrawCallback());
+  support_.SubmitCompositorFrame(root_local_surface_id_, std::move(root_frame));
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
   const RenderPassList& aggregated_pass_list =
       aggregated_frame.render_pass_list;
 
   ASSERT_EQ(3u, aggregated_pass_list.size());
 
   ASSERT_EQ(1u, aggregated_pass_list[0]->shared_quad_state_list.size());
 
   // The first pass should have one shared quad state for the one solid color
@@ skipping 52 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();
+  middle_support.EvictFrame();
 }
 
 // Tests that damage rects are aggregated correctly when surfaces change.
 TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateDamageRect) {
-  SurfaceFactory parent_factory(kArbitraryMiddleFrameSinkId, &manager_,
-                                &empty_client_);
+  CompositorFrameSinkSupport parent_support(
+      nullptr, &manager_, kArbitraryMiddleFrameSinkId, is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   test::Quad child_quads[] = {test::Quad::RenderPassQuad(1)};
   test::Pass child_passes[] = {
       test::Pass(child_quads, arraysize(child_quads), 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);
 
   LocalSurfaceId child_local_surface_id = allocator_.GenerateId();
-  SurfaceId child_surface_id(child_factory_.frame_sink_id(),
+  SurfaceId child_surface_id(child_support_.frame_sink_id(),
                              child_local_surface_id);
-  child_factory_.SubmitCompositorFrame(child_local_surface_id,
-                                       std::move(child_frame),
-                                       SurfaceFactory::DrawCallback());
+  child_support_.SubmitCompositorFrame(child_local_surface_id,
+                                       std::move(child_frame));
 
   test::Quad parent_surface_quads[] = {
       test::Quad::SurfaceQuad(child_surface_id, InvalidSurfaceId(), 1.f)};
   test::Pass parent_surface_passes[] = {
       test::Pass(parent_surface_quads, arraysize(parent_surface_quads), 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));
 
   LocalSurfaceId parent_local_surface_id = allocator_.GenerateId();
-  SurfaceId parent_surface_id(parent_factory.frame_sink_id(),
+  SurfaceId parent_surface_id(parent_support.frame_sink_id(),
                               parent_local_surface_id);
-  parent_factory.SubmitCompositorFrame(parent_local_surface_id,
-                                       std::move(parent_surface_frame),
-                                       SurfaceFactory::DrawCallback());
+  parent_support.SubmitCompositorFrame(parent_local_surface_id,
+                                       std::move(parent_surface_frame));
 
   test::Quad root_surface_quads[] = {
       test::Quad::SurfaceQuad(parent_surface_id, InvalidSurfaceId(), 1.f)};
   test::Quad root_render_pass_quads[] = {test::Quad::RenderPassQuad(1)};
 
   test::Pass root_passes[] = {
       test::Pass(root_surface_quads, arraysize(root_surface_quads), 1),
       test::Pass(root_render_pass_quads, arraysize(root_render_pass_quads), 2)};
 
   CompositorFrame root_frame;
   AddPasses(&root_frame.render_pass_list, gfx::Rect(SurfaceSize()), root_passes,
             arraysize(root_passes));
 
   root_frame.render_pass_list[0]
       ->shared_quad_state_list.front()
       ->quad_to_target_transform.Translate(0, 10);
   root_frame.render_pass_list[0]->damage_rect = gfx::Rect(5, 5, 10, 10);
   root_frame.render_pass_list[1]->damage_rect = gfx::Rect(5, 5, 100, 100);
 
-  factory_.SubmitCompositorFrame(root_local_surface_id_, std::move(root_frame),
-                                 SurfaceFactory::DrawCallback());
+  support_.SubmitCompositorFrame(root_local_surface_id_, std::move(root_frame));
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_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());
 
   // Damage rect for first aggregation should contain entire root surface.
   EXPECT_TRUE(
       aggregated_pass_list[1]->damage_rect.Contains(gfx::Rect(SurfaceSize())));
 
   {
     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_surface_id,
-                                         std::move(child_frame),
-                                         SurfaceFactory::DrawCallback());
+    child_support_.SubmitCompositorFrame(child_local_surface_id,
+                                         std::move(child_frame));
 
-    SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+    SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_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
     // used.
     EXPECT_EQ(gfx::Rect(10, 20, 10, 10).ToString(),
               aggregated_pass_list[1]->damage_rect.ToString());
   }
 
   {
     CompositorFrame root_frame;
     AddPasses(&root_frame.render_pass_list, gfx::Rect(SurfaceSize()),
               root_passes, arraysize(root_passes));
 
     root_frame.render_pass_list[0]
         ->shared_quad_state_list.front()
         ->quad_to_target_transform.Translate(0, 10);
     root_frame.render_pass_list[0]->damage_rect = gfx::Rect(0, 0, 1, 1);
 
-    factory_.SubmitCompositorFrame(root_local_surface_id_,
-                                   std::move(root_frame),
-                                   SurfaceFactory::DrawCallback());
+    support_.SubmitCompositorFrame(root_local_surface_id_,
+                                   std::move(root_frame));
   }
 
   {
     CompositorFrame root_frame;
     AddPasses(&root_frame.render_pass_list, gfx::Rect(SurfaceSize()),
               root_passes, arraysize(root_passes));
 
     root_frame.render_pass_list[0]
         ->shared_quad_state_list.front()
         ->quad_to_target_transform.Translate(0, 10);
     root_frame.render_pass_list[0]->damage_rect = gfx::Rect(1, 1, 1, 1);
 
-    factory_.SubmitCompositorFrame(root_local_surface_id_,
-                                   std::move(root_frame),
-                                   SurfaceFactory::DrawCallback());
+    support_.SubmitCompositorFrame(root_local_surface_id_,
+                                   std::move(root_frame));
 
-    SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+    SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_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());
 
     // The root surface was enqueued without being aggregated once, so it should
     // be treated as completely damaged.
     EXPECT_TRUE(aggregated_pass_list[1]->damage_rect.Contains(
         gfx::Rect(SurfaceSize())));
   }
 
   // No Surface changed, so no damage should be given.
   {
-    SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+    SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_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());
 
     EXPECT_TRUE(aggregated_pass_list[1]->damage_rect.IsEmpty());
   }
 
   // SetFullDamageRectForSurface should cause the entire output to be
   // marked as damaged.
   {
     aggregator_.SetFullDamageForSurface(root_surface_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());
 
     EXPECT_TRUE(aggregated_pass_list[1]->damage_rect.Contains(
         gfx::Rect(SurfaceSize())));
   }
 
-  parent_factory.EvictSurface();
+  parent_support.EvictFrame();
 }
 
 // Check that damage is correctly calculated for surfaces.
 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), 2)};
 
   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(5, 5, 100, 100);
 
-  factory_.SubmitCompositorFrame(root_local_surface_id_, std::move(root_frame),
-                                 SurfaceFactory::DrawCallback());
+  support_.SubmitCompositorFrame(root_local_surface_id_, std::move(root_frame));
 
   {
-    SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+    SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_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());
 
     // Damage rect for first aggregation should contain entire root surface.
     EXPECT_TRUE(aggregated_pass_list[0]->damage_rect.Contains(
         gfx::Rect(SurfaceSize())));
   }
 
   LocalSurfaceId second_root_local_surface_id = allocator_.GenerateId();
-  SurfaceId second_root_surface_id(factory_.frame_sink_id(),
+  SurfaceId second_root_surface_id(support_.frame_sink_id(),
                                    second_root_local_surface_id);
   {
     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), 2)};
 
     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_.SubmitCompositorFrame(second_root_local_surface_id,
-                                   std::move(root_frame),
-                                   SurfaceFactory::DrawCallback());
+    support_.SubmitCompositorFrame(second_root_local_surface_id,
+                                   std::move(root_frame));
   }
   {
     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());
 
@@ skipping 16 matching lines @@
 class SurfaceAggregatorPartialSwapTest
     : public SurfaceAggregatorValidSurfaceTest {
  public:
   SurfaceAggregatorPartialSwapTest()
       : SurfaceAggregatorValidSurfaceTest(true) {}
 };
 
 // Tests that quads outside the damage rect are ignored.
 TEST_F(SurfaceAggregatorPartialSwapTest, IgnoreOutside) {
   LocalSurfaceId child_local_surface_id = allocator_.GenerateId();
-  SurfaceId child_surface_id(child_factory_.frame_sink_id(),
+  SurfaceId child_surface_id(child_support_.frame_sink_id(),
                              child_local_surface_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.
   {
     int child_pass_id = 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[] = {
@@ skipping 17 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_surface_id,
+    SubmitPassListAsFrame(&child_support_, child_local_surface_id,
                           &child_pass_list);
   }
 
   {
     test::Quad root_quads[] = {
         test::Quad::SurfaceQuad(child_surface_id, InvalidSurfaceId(), 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));
 
     RenderPass* root_pass = root_pass_list[0].get();
     root_pass->shared_quad_state_list.front()
         ->quad_to_target_transform.Translate(10, 10);
     root_pass->damage_rect = gfx::Rect(0, 0, 1, 1);
 
-    SubmitPassListAsFrame(&factory_, root_local_surface_id_, &root_pass_list);
+    SubmitPassListAsFrame(&support_, root_local_surface_id_, &root_pass_list);
   }
 
-  SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId root_surface_id(support_.frame_sink_id(), root_local_surface_id_);
   CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
   const RenderPassList& aggregated_pass_list =
       aggregated_frame.render_pass_list;
 
   ASSERT_EQ(3u, aggregated_pass_list.size());
 
   // Damage rect for first aggregation should contain entire root surface.
   EXPECT_EQ(gfx::Rect(SurfaceSize()), aggregated_pass_list[2]->damage_rect);
   EXPECT_EQ(1u, aggregated_pass_list[0]->quad_list.size());
   EXPECT_EQ(1u, aggregated_pass_list[1]->quad_list.size());
   EXPECT_EQ(1u, aggregated_pass_list[2]->quad_list.size());
 
   // Create a root surface with a smaller damage rect.
   {
     test::Quad root_quads[] = {
         test::Quad::SurfaceQuad(child_surface_id, InvalidSurfaceId(), 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));
 
     RenderPass* root_pass = root_pass_list[0].get();
     root_pass->shared_quad_state_list.front()
         ->quad_to_target_transform.Translate(10, 10);
     root_pass->damage_rect = gfx::Rect(10, 10, 2, 2);
-    SubmitPassListAsFrame(&factory_, root_local_surface_id_, &root_pass_list);
+    SubmitPassListAsFrame(&support_, root_local_surface_id_, &root_pass_list);
   }
 
   {
     CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
     const RenderPassList& aggregated_pass_list =
         aggregated_frame.render_pass_list;
 
     ASSERT_EQ(3u, aggregated_pass_list.size());
 
@@ skipping 29 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_surface_id,
+    SubmitPassListAsFrame(&child_support_, child_local_surface_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.
@@ skipping 39 matching lines @@
     RenderPassList root_pass_list;
     AddPasses(&root_pass_list, gfx::Rect(SurfaceSize()), root_passes,
               arraysize(root_passes));
 
     RenderPass* filter_pass = root_pass_list[1].get();
     filter_pass->shared_quad_state_list.front()
         ->quad_to_target_transform.Translate(10, 10);
     RenderPass* root_pass = root_pass_list[2].get();
     filter_pass->filters.Append(FilterOperation::CreateBlurFilter(2));
     root_pass->damage_rect = gfx::Rect(10, 10, 2, 2);
-    SubmitPassListAsFrame(&factory_, root_local_surface_id_, &root_pass_list);
+    SubmitPassListAsFrame(&support_, root_local_surface_id_, &root_pass_list);
   }
 
   {
     CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
     const RenderPassList& aggregated_pass_list =
         aggregated_frame.render_pass_list;
 
     ASSERT_EQ(4u, aggregated_pass_list.size());
 
@@ skipping 27 matching lines @@
     RenderPassList root_pass_list;
     AddPasses(&root_pass_list, gfx::Rect(SurfaceSize()), root_passes,
               arraysize(root_passes));
 
     RenderPass* pass = root_pass_list[0].get();
     RenderPass* root_pass = root_pass_list[1].get();
     root_pass->shared_quad_state_list.ElementAt(1)
         ->quad_to_target_transform.Translate(10, 10);
     pass->background_filters.Append(FilterOperation::CreateBlurFilter(2));
     root_pass->damage_rect = gfx::Rect(10, 10, 2, 2);
-    SubmitPassListAsFrame(&factory_, root_local_surface_id_, &root_pass_list);
+    SubmitPassListAsFrame(&support_, root_local_surface_id_, &root_pass_list);
   }
 
   {
     CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
     const RenderPassList& aggregated_pass_list =
         aggregated_frame.render_pass_list;
 
     ASSERT_EQ(3u, aggregated_pass_list.size());
 
@@ skipping 23 matching lines @@
     aggregator_->set_output_is_secure(true);
   }
 
  protected:
   SurfaceManager manager_;
   std::unique_ptr<SharedBitmapManager> shared_bitmap_manager_;
   std::unique_ptr<ResourceProvider> resource_provider_;
   std::unique_ptr<SurfaceAggregator> aggregator_;
 };
 
-class ResourceTrackingSurfaceFactoryClient : public SurfaceFactoryClient {
- public:
-  ResourceTrackingSurfaceFactoryClient() {}
-  ~ResourceTrackingSurfaceFactoryClient() override {}
-
-  void ReturnResources(const ReturnedResourceArray& resources) override {
-    returned_resources_ = resources;
-  }
-
-  ReturnedResourceArray returned_resources() const {
-    return returned_resources_;
-  }
-
-  void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override {}
-
- private:
-  ReturnedResourceArray returned_resources_;
-
-  DISALLOW_COPY_AND_ASSIGN(ResourceTrackingSurfaceFactoryClient);
-};
-
 void SubmitCompositorFrameWithResources(ResourceId* resource_ids,
                                         size_t num_resource_ids,
                                         bool valid,
                                         SurfaceId child_id,
-                                        SurfaceFactory* factory,
+                                        CompositorFrameSinkSupport* support,
                                         SurfaceId surface_id) {
   CompositorFrame frame;
   std::unique_ptr<RenderPass> pass = RenderPass::Create();
   pass->id = 1;
   SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
   sqs->opacity = 1.f;
   if (child_id.is_valid()) {
     SurfaceDrawQuad* surface_quad =
         pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
     surface_quad->SetNew(sqs, gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1),
@@ skipping 18 matching lines @@
     const float vertex_opacity[4] = {0.f, 0.f, 1.f, 1.f};
     bool flipped = false;
     bool nearest_neighbor = false;
     bool secure_output_only = true;
     quad->SetAll(sqs, rect, opaque_rect, visible_rect, needs_blending,
                  resource_ids[i], gfx::Size(), premultiplied_alpha, uv_top_left,
                  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_surface_id(),
-                                 std::move(frame),
-                                 SurfaceFactory::DrawCallback());
+  support->SubmitCompositorFrame(surface_id.local_surface_id(),
+                                 std::move(frame));
 }
 
 TEST_F(SurfaceAggregatorWithResourcesTest, TakeResourcesOneSurface) {
-  ResourceTrackingSurfaceFactoryClient client;
-  SurfaceFactory factory(kArbitraryRootFrameSinkId, &manager_, &client);
+  CompositorFrameSinkSupport support(
+      nullptr, &manager_, kArbitraryRootFrameSinkId, is_root,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   LocalSurfaceId local_surface_id(7u, base::UnguessableToken::Create());
-  SurfaceId surface_id(factory.frame_sink_id(), local_surface_id);
+  SurfaceId surface_id(support.frame_sink_id(), local_surface_id);
 
   ResourceId ids[] = {11, 12, 13};
   SubmitCompositorFrameWithResources(ids, arraysize(ids), true, SurfaceId(),
-                                     &factory, surface_id);
+                                     &support, surface_id);
 
   CompositorFrame frame = aggregator_->Aggregate(surface_id);
 
   // Nothing should be available to be returned yet.
-  EXPECT_TRUE(client.returned_resources().empty());
+  EXPECT_TRUE(support.LastReturnedResourcesForTesting().empty());
 
-  SubmitCompositorFrameWithResources(NULL, 0u, true, SurfaceId(), &factory,
+  SubmitCompositorFrameWithResources(NULL, 0u, true, SurfaceId(), &support,
                                      surface_id);
 
   frame = aggregator_->Aggregate(surface_id);
 
-  ASSERT_EQ(3u, client.returned_resources().size());
+  ASSERT_EQ(3u, support.LastReturnedResourcesForTesting().size());
   ResourceId returned_ids[3];
   for (size_t i = 0; i < 3; ++i) {
-    returned_ids[i] = client.returned_resources()[i].id;
+    returned_ids[i] = support.LastReturnedResourcesForTesting()[i].id;
   }
   EXPECT_THAT(returned_ids,
               testing::WhenSorted(testing::ElementsAreArray(ids)));
 
-  factory.EvictSurface();
+  support.EvictFrame();
 }
 
 TEST_F(SurfaceAggregatorWithResourcesTest, TakeInvalidResources) {
-  ResourceTrackingSurfaceFactoryClient client;
-  SurfaceFactory factory(kArbitraryRootFrameSinkId, &manager_, &client);
+  CompositorFrameSinkSupport support(
+      nullptr, &manager_, kArbitraryRootFrameSinkId, is_root,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   LocalSurfaceId local_surface_id(7u, base::UnguessableToken::Create());
-  SurfaceId surface_id(factory.frame_sink_id(), local_surface_id);
+  SurfaceId surface_id(support.frame_sink_id(), local_surface_id);
 
   CompositorFrame frame;
   std::unique_ptr<RenderPass> pass = RenderPass::Create();
   pass->id = 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_surface_id, std::move(frame),
-                                SurfaceFactory::DrawCallback());
+  support.SubmitCompositorFrame(local_surface_id, std::move(frame));
 
   CompositorFrame returned_frame = aggregator_->Aggregate(surface_id);
 
   // Nothing should be available to be returned yet.
-  EXPECT_TRUE(client.returned_resources().empty());
+  EXPECT_TRUE(support.LastReturnedResourcesForTesting().empty());
 
-  SubmitCompositorFrameWithResources(NULL, 0, true, SurfaceId(), &factory,
+  SubmitCompositorFrameWithResources(NULL, 0, true, SurfaceId(), &support,
                                      surface_id);
-  ASSERT_EQ(1u, client.returned_resources().size());
-  EXPECT_EQ(11u, client.returned_resources()[0].id);
+  ASSERT_EQ(1u, support.LastReturnedResourcesForTesting().size());
+  EXPECT_EQ(11u, support.LastReturnedResourcesForTesting()[0].id);
 
-  factory.EvictSurface();
+  support.EvictFrame();
 }
 
 TEST_F(SurfaceAggregatorWithResourcesTest, TwoSurfaces) {
-  ResourceTrackingSurfaceFactoryClient client;
-  SurfaceFactory factory1(FrameSinkId(1, 1), &manager_, &client);
-  SurfaceFactory factory2(FrameSinkId(2, 2), &manager_, &client);
+  CompositorFrameSinkSupport support1(
+      nullptr, &manager_, FrameSinkId(1, 1), is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
+  CompositorFrameSinkSupport support2(
+      nullptr, &manager_, FrameSinkId(2, 2), is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   LocalSurfaceId local_frame1_id(7u, base::UnguessableToken::Create());
-  SurfaceId surface1_id(factory1.frame_sink_id(), local_frame1_id);
+  SurfaceId surface1_id(support1.frame_sink_id(), local_frame1_id);
 
   LocalSurfaceId local_frame2_id(8u, base::UnguessableToken::Create());
-  SurfaceId surface2_id(factory2.frame_sink_id(), local_frame2_id);
+  SurfaceId surface2_id(support2.frame_sink_id(), local_frame2_id);
 
   ResourceId ids[] = {11, 12, 13};
   SubmitCompositorFrameWithResources(ids, arraysize(ids), true, SurfaceId(),
-                                     &factory1, surface1_id);
+                                     &support1, surface1_id);
   ResourceId ids2[] = {14, 15, 16};
   SubmitCompositorFrameWithResources(ids2, arraysize(ids2), true, SurfaceId(),
-                                     &factory2, surface2_id);
+                                     &support2, surface2_id);
 
   CompositorFrame frame = aggregator_->Aggregate(surface1_id);
 
-  SubmitCompositorFrameWithResources(NULL, 0, true, SurfaceId(), &factory1,
+  SubmitCompositorFrameWithResources(NULL, 0, true, SurfaceId(), &support1,
                                      surface1_id);
 
   // Nothing should be available to be returned yet.
-  EXPECT_TRUE(client.returned_resources().empty());
+  EXPECT_TRUE(support1.LastReturnedResourcesForTesting().empty());
+  EXPECT_TRUE(support2.LastReturnedResourcesForTesting().empty());
 
   frame = aggregator_->Aggregate(surface2_id);
 
   // surface1_id wasn't referenced, so its resources should be returned.
-  ASSERT_EQ(3u, client.returned_resources().size());
+  ASSERT_EQ(3u, support1.LastReturnedResourcesForTesting().size());
+  ASSERT_TRUE(support2.LastReturnedResourcesForTesting().empty());
   ResourceId returned_ids[3];
   for (size_t i = 0; i < 3; ++i) {
-    returned_ids[i] = client.returned_resources()[i].id;
+    returned_ids[i] = support1.LastReturnedResourcesForTesting()[i].id;
   }
   EXPECT_THAT(returned_ids,
               testing::WhenSorted(testing::ElementsAreArray(ids)));
   EXPECT_EQ(3u, resource_provider_->num_resources());
 
-  factory1.EvictSurface();
-  factory2.EvictSurface();
+  support1.EvictFrame();
+  support2.EvictFrame();
 }
 
 // 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(kArbitraryChildFrameSinkId1, &manager_, &client);
+  CompositorFrameSinkSupport root_support(
+      nullptr, &manager_, kArbitraryRootFrameSinkId, is_root,
+      handles_frame_sink_id_invalidation, needs_sync_points);
+  CompositorFrameSinkSupport middle_support(
+      nullptr, &manager_, kArbitraryMiddleFrameSinkId, is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
+  CompositorFrameSinkSupport child_support(
+      nullptr, &manager_, kArbitraryFrameSinkId1, is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   LocalSurfaceId root_local_surface_id(7u, kArbitraryToken);
-  SurfaceId root_surface_id(root_factory.frame_sink_id(),
+  SurfaceId root_surface_id(root_support.frame_sink_id(),
                             root_local_surface_id);
   LocalSurfaceId middle_local_surface_id(8u, kArbitraryToken);
-  SurfaceId middle_surface_id(middle_factory.frame_sink_id(),
+  SurfaceId middle_surface_id(middle_support.frame_sink_id(),
                               middle_local_surface_id);
   LocalSurfaceId child_local_surface_id(9u, kArbitraryToken);
-  SurfaceId child_surface_id(child_factory.frame_sink_id(),
+  SurfaceId child_surface_id(child_support.frame_sink_id(),
                              child_local_surface_id);
 
   ResourceId ids[] = {14, 15, 16};
   SubmitCompositorFrameWithResources(ids, arraysize(ids), true, SurfaceId(),
-                                     &child_factory, child_surface_id);
+                                     &child_support, child_surface_id);
 
   ResourceId ids2[] = {17, 18, 19};
   SubmitCompositorFrameWithResources(ids2, arraysize(ids2), false,
-                                     child_surface_id, &middle_factory,
+                                     child_surface_id, &middle_support,
                                      middle_surface_id);
 
   ResourceId ids3[] = {20, 21, 22};
   SubmitCompositorFrameWithResources(ids3, arraysize(ids3), true,
-                                     middle_surface_id, &root_factory,
+                                     middle_surface_id, &root_support,
                                      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, &middle_support,
                                      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();
+  root_support.EvictFrame();
+  middle_support.EvictFrame();
+  child_support.EvictFrame();
 }
 
 TEST_F(SurfaceAggregatorWithResourcesTest, SecureOutputTexture) {
-  ResourceTrackingSurfaceFactoryClient client;
-  SurfaceFactory factory1(FrameSinkId(1, 1), &manager_, &client);
-  SurfaceFactory factory2(FrameSinkId(2, 2), &manager_, &client);
+  CompositorFrameSinkSupport support1(
+      nullptr, &manager_, FrameSinkId(1, 1), is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
+  CompositorFrameSinkSupport support2(
+      nullptr, &manager_, FrameSinkId(2, 2), is_root_child,
+      handles_frame_sink_id_invalidation, needs_sync_points);
   LocalSurfaceId local_frame1_id(7u, base::UnguessableToken::Create());
-  SurfaceId surface1_id(factory1.frame_sink_id(), local_frame1_id);
+  SurfaceId surface1_id(support1.frame_sink_id(), local_frame1_id);
 
   LocalSurfaceId local_frame2_id(8u, base::UnguessableToken::Create());
-  SurfaceId surface2_id(factory2.frame_sink_id(), local_frame2_id);
+  SurfaceId surface2_id(support2.frame_sink_id(), local_frame2_id);
 
   ResourceId ids[] = {11, 12, 13};
   SubmitCompositorFrameWithResources(ids, arraysize(ids), true, SurfaceId(),
-                                     &factory1, surface1_id);
+                                     &support1, 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 = 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, SurfaceDrawQuadType::PRIMARY, nullptr);
     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());
+    support2.SubmitCompositorFrame(local_frame2_id, std::move(frame));
   }
 
   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();
+  support1.EvictFrame();
+  support2.EvictFrame();
 }
 
 // Ensure that the render passes have correct color spaces.
 TEST_F(SurfaceAggregatorValidSurfaceTest, ColorSpaceTest) {
   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]), 2),
                          test::Pass(quads[1], arraysize(quads[1]), 1)};
   gfx::ColorSpace color_space1 = gfx::ColorSpace::CreateXYZD50();
   gfx::ColorSpace color_space2 = gfx::ColorSpace::CreateSRGB();
   gfx::ColorSpace color_space3 = gfx::ColorSpace::CreateSCRGBLinear();
 
-  SubmitCompositorFrame(&factory_, passes, arraysize(passes),
+  SubmitCompositorFrame(&support_, passes, arraysize(passes),
                         root_local_surface_id_);
 
-  SurfaceId surface_id(factory_.frame_sink_id(), root_local_surface_id_);
+  SurfaceId surface_id(support_.frame_sink_id(), root_local_surface_id_);
 
   CompositorFrame aggregated_frame;
   aggregator_.SetOutputColorSpace(color_space1, color_space1);
   aggregated_frame = aggregator_.Aggregate(surface_id);
   EXPECT_EQ(2u, aggregated_frame.render_pass_list.size());
   EXPECT_EQ(color_space1, aggregated_frame.render_pass_list[0]->color_space);
   EXPECT_EQ(color_space1, aggregated_frame.render_pass_list[1]->color_space);
 
   aggregator_.SetOutputColorSpace(color_space2, color_space2);
   aggregated_frame = aggregator_.Aggregate(surface_id);
   EXPECT_EQ(2u, aggregated_frame.render_pass_list.size());
   EXPECT_EQ(color_space2, aggregated_frame.render_pass_list[0]->color_space);
   EXPECT_EQ(color_space2, aggregated_frame.render_pass_list[1]->color_space);
 
   aggregator_.SetOutputColorSpace(color_space1, color_space3);
   aggregated_frame = aggregator_.Aggregate(surface_id);
   EXPECT_EQ(3u, aggregated_frame.render_pass_list.size());
   EXPECT_EQ(color_space1, aggregated_frame.render_pass_list[0]->color_space);
   EXPECT_EQ(color_space1, aggregated_frame.render_pass_list[1]->color_space);
   EXPECT_EQ(color_space3, aggregated_frame.render_pass_list[2]->color_space);
 }
 
 }  // namespace
 }  // namespace cc