Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

ui/compositor/test/in_process_context_factory.cc

Index: ui/compositor/test/in_process_context_factory.cc
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index 7c7d8b9772c563e7eccaea6f39a0f7e1c242e6c8..3086087e323874ca78775fa2d4807180e5ca4720 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -194,8 +194,8 @@ void InProcessContextFactory::CreateCompositorFrameSink(
 
   auto* display = per_compositor_data_[compositor.get()].get();
   auto compositor_frame_sink = base::MakeUnique<cc::DirectCompositorFrameSink>(
-      surface_manager_, compositor->surface_id_allocator(), display,
-      context_provider, shared_worker_context_provider_);
+      compositor->frame_sink_id(), surface_manager_, display, context_provider,
+      shared_worker_context_provider_);
   compositor->SetCompositorFrameSink(std::move(compositor_frame_sink));
 }