WIP: Propagate SurfaceID up window tree hierarchy

services/ui/ws/server_window_surface.h

Index: services/ui/ws/server_window_surface.h
diff --git a/services/ui/ws/server_window_surface.h b/services/ui/ws/server_window_surface.h
index c5922b3f955a6887e2fa42db7e0bf09262607759..ac2dc34991e8298efb35c299de6015205dfcd3a7 100644
--- a/services/ui/ws/server_window_surface.h
+++ b/services/ui/ws/server_window_surface.h
@@ -32,6 +32,7 @@ class ServerWindowSurface : public mojom::Surface,
                             public cc::SurfaceFactoryClient {
  public:
   ServerWindowSurface(ServerWindowSurfaceManager* manager,
+                      const cc::FrameSinkId& frame_sink_id,
                       mojo::InterfaceRequest<mojom::Surface> request,
                       mojom::SurfaceClientPtr client);
 
@@ -60,7 +61,7 @@ class ServerWindowSurface : public mojom::Surface,
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
   void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
 
-  ServerWindowSurfaceManager* manager_;  // Owns this.
+  ServerWindowSurfaceManager* const manager_;  // Owns this.
 
   gfx::Size last_submitted_frame_size_;