WIP: Propagate SurfaceID up window tree hierarchy

cc/surfaces/direct_compositor_frame_sink.cc

Index: cc/surfaces/direct_compositor_frame_sink.cc
diff --git a/cc/surfaces/direct_compositor_frame_sink.cc b/cc/surfaces/direct_compositor_frame_sink.cc
index b96cbbc93a327958a5e5940e418868020db009aa..727c374e7e919fdafae238fa195a6df4a88bbbc0 100644
--- a/cc/surfaces/direct_compositor_frame_sink.cc
+++ b/cc/surfaces/direct_compositor_frame_sink.cc
@@ -59,7 +59,7 @@ bool DirectCompositorFrameSink::BindToClient(
   DCHECK(thread_checker_.CalledOnValidThread());
 
   surface_manager_->RegisterSurfaceFactoryClient(
-      surface_id_allocator_->client_id(), this);
+      surface_id_allocator_->frame_sink_id(), this);
 
   if (!CompositorFrameSink::BindToClient(client))
     return false;
@@ -73,7 +73,7 @@ bool DirectCompositorFrameSink::BindToClient(
   // Avoid initializing GL context here, as this should be sharing the
   // Display's context.
   display_->Initialize(this, surface_manager_,
-                       surface_id_allocator_->client_id());
+                       surface_id_allocator_->frame_sink_id());
   return true;
 }
 
@@ -82,7 +82,7 @@ void DirectCompositorFrameSink::DetachFromClient() {
   // Unregister the SurfaceFactoryClient here instead of the dtor so that only
   // one client is alive for this namespace at any given time.
   surface_manager_->UnregisterSurfaceFactoryClient(
-      surface_id_allocator_->client_id());
+      surface_id_allocator_->frame_sink_id());
   if (!delegated_surface_id_.is_null())
     factory_.Destroy(delegated_surface_id_);