Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

cc/surfaces/direct_compositor_frame_sink.h

Index: cc/surfaces/direct_compositor_frame_sink.h
diff --git a/cc/surfaces/direct_compositor_frame_sink.h b/cc/surfaces/direct_compositor_frame_sink.h
index 701f97509d06ee3a27c53773329fc3c540852a6c..b9213d0fd732c87c0f1247b2f8f176b5c05f681c 100644
--- a/cc/surfaces/direct_compositor_frame_sink.h
+++ b/cc/surfaces/direct_compositor_frame_sink.h
@@ -11,6 +11,7 @@
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
+#include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surfaces_export.h"
 
 namespace cc {
@@ -28,14 +29,14 @@ class CC_SURFACES_EXPORT DirectCompositorFrameSink
   // The underlying Display, SurfaceManager, and SurfaceIdAllocator must outlive
   // this class.
   DirectCompositorFrameSink(
+      const FrameSinkId& frame_sink_id,
       SurfaceManager* surface_manager,
-      SurfaceIdAllocator* allocator,
       Display* display,
       scoped_refptr<ContextProvider> context_provider,
       scoped_refptr<ContextProvider> worker_context_provider);
   DirectCompositorFrameSink(
+      const FrameSinkId& frame_sink_id,
       SurfaceManager* surface_manager,
-      SurfaceIdAllocator* allocator,
       Display* display,
       scoped_refptr<VulkanContextProvider> vulkan_context_provider);
   ~DirectCompositorFrameSink() override;
@@ -62,8 +63,9 @@ class CC_SURFACES_EXPORT DirectCompositorFrameSink
   // This class is only meant to be used on a single thread.
   base::ThreadChecker thread_checker_;
 
+  FrameSinkId frame_sink_id_;
   SurfaceManager* surface_manager_;
-  SurfaceIdAllocator* surface_id_allocator_;
+  SurfaceIdAllocator surface_id_allocator_;
   Display* display_;
   SurfaceFactory factory_;
   SurfaceId delegated_surface_id_;