Fix surface reference assumptions in SurfaceManager.

cc/surfaces/surface_factory_unittest.cc

Index: cc/surfaces/surface_factory_unittest.cc
diff --git a/cc/surfaces/surface_factory_unittest.cc b/cc/surfaces/surface_factory_unittest.cc
index 6deff8b8d5061fec6d561ae16f06fb242d5d3685..03000b14014864e5f0d448e52fe4b29f59e2d910 100644
--- a/cc/surfaces/surface_factory_unittest.cc
+++ b/cc/surfaces/surface_factory_unittest.cc
@@ -502,11 +502,16 @@ TEST_F(SurfaceFactoryTest, Reset) {
                                   SurfaceFactory::DrawCallback());
   EXPECT_EQ(last_created_surface_id().local_frame_id(), id);
 
+  manager_.RegisterFrameSinkId(kAnotherArbitraryFrameSinkId);
+
   SurfaceId surface_id(kArbitraryFrameSinkId, id);
-  manager_.AddSurfaceReference(manager_.GetRootSurfaceId(), surface_id);
+  Surface* surface = manager_.GetSurfaceForId(surface_id);
+  surface->AddDestructionDependency(
+      SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
   factory_->Reset();
   EXPECT_TRUE(client_.returned_resources().empty());
-  manager_.RemoveSurfaceReference(manager_.GetRootSurfaceId(), surface_id);
+
+  manager_.SatisfySequence(SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
   EXPECT_TRUE(client_.returned_resources().empty());
   local_frame_id_ = LocalFrameId();
 }