mus: Each ServerWindowSurface should have a different client ID

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 d30e8c34ce1148aee2a6a86a02cafa7375dcc55d..5f1e6d675d51c2c1feda64e292dae3254b3ccead 100644
--- a/services/ui/ws/server_window_surface.h
+++ b/services/ui/ws/server_window_surface.h
@@ -51,9 +51,6 @@ class ServerWindowSurface : public mojom::Surface,
   // Destroys old surfaces that have been outdated by a new surface.
   void DestroySurfacesScheduledForDestruction();
 
-  // Registers this with the SurfaceManager
-  void RegisterForBeginFrames();
-
  private:
   ServerWindow* window();
 
@@ -66,6 +63,7 @@ class ServerWindowSurface : public mojom::Surface,
   gfx::Size last_submitted_frame_size_;
 
   cc::SurfaceId surface_id_;
+  cc::SurfaceIdAllocator surface_id_allocator_;
   cc::SurfaceFactory surface_factory_;
 
   mojom::SurfaceClientPtr client_;
@@ -74,8 +72,6 @@ class ServerWindowSurface : public mojom::Surface,
   // Set of surface ids that need to be destroyed.
   std::set<cc::SurfaceId> surfaces_scheduled_for_destruction_;
 
-  bool registered_surface_factory_client_;
-
   DISALLOW_COPY_AND_ASSIGN(ServerWindowSurface);
 };