WIP: Propagate SurfaceID up window tree hierarchy

cc/surfaces/surface.cc

Index: cc/surfaces/surface.cc
diff --git a/cc/surfaces/surface.cc b/cc/surfaces/surface.cc
index 639a15ed7189aff19c6d14b287351113e6a3e838..c9c24bca2defba312f994b20e0fa88d3f17d21cd 100644
--- a/cc/surfaces/surface.cc
+++ b/cc/surfaces/surface.cc
@@ -89,7 +89,7 @@ void Surface::QueueFrame(CompositorFrame frame, const DrawCallback& callback) {
     // Notify the manager that sequences were satisfied either if some new
     // sequences were satisfied, or if the set of referenced surfaces changed
     // to force a GC to happen.
-    factory_->manager()->DidSatisfySequences(surface_id_.client_id(),
+    factory_->manager()->DidSatisfySequences(surface_id_.frame_sink_id(),
                                              &satisfies_sequences);
   }
 }
@@ -165,13 +165,13 @@ void Surface::AddDestructionDependency(SurfaceSequence sequence) {
 
 void Surface::SatisfyDestructionDependencies(
     std::unordered_set<SurfaceSequence, SurfaceSequenceHash>* sequences,
-    std::unordered_set<uint32_t>* valid_client_ids) {
+    std::unordered_set<FrameSinkId, FrameSinkIdHash>* valid_frame_sink_ids) {
   destruction_dependencies_.erase(
       std::remove_if(destruction_dependencies_.begin(),
                      destruction_dependencies_.end(),
-                     [sequences, valid_client_ids](SurfaceSequence seq) {
+                     [sequences, valid_frame_sink_ids](SurfaceSequence seq) {
                        return (!!sequences->erase(seq) ||
-                               !valid_client_ids->count(seq.client_id));
+                               !valid_frame_sink_ids->count(seq.frame_sink_id));
                      }),
       destruction_dependencies_.end());
 }