Fix surface reference assumptions in SurfaceManager.

cc/surfaces/surface_factory_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_factory.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 484 matching lines @@
 
   TransferableResource resource;
   resource.id = 1;
   resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
   CompositorFrame frame;
   frame.resource_list.push_back(resource);
   factory_->SubmitCompositorFrame(id, std::move(frame),
                                   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();
 }
 
 TEST_F(SurfaceFactoryTest, DestroySequence) {
   LocalFrameId local_frame_id2(5, kArbitraryToken);
   std::unique_ptr<SurfaceFactory> factory2(
       new SurfaceFactory(kArbitraryFrameSinkId, &manager_, &client_));
   SurfaceId id2(kArbitraryFrameSinkId, local_frame_id2);
   factory2->SubmitCompositorFrame(local_frame_id2, CompositorFrame(),
@@ skipping 169 matching lines @@
   factory_->SubmitCompositorFrame(local_frame_id_, std::move(frame),
                                   SurfaceFactory::DrawCallback());
   SurfaceId expected_surface_id(factory_->frame_sink_id(), local_frame_id_);
   EXPECT_EQ(expected_surface_id, last_surface_info_.id());
   EXPECT_EQ(2.5f, last_surface_info_.device_scale_factor());
   EXPECT_EQ(gfx::Size(7, 8), last_surface_info_.size_in_pixels());
 }
 
 }  // namespace
 }  // namespace cc