Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

cc/surfaces/surface_factory.h

Index: cc/surfaces/surface_factory.h
diff --git a/cc/surfaces/surface_factory.h b/cc/surfaces/surface_factory.h
index 566144433405fe31ef019ad6b1510ee4ec819292..b3da3cbb6152271fe6db9907834305d3aa82d1a6 100644
--- a/cc/surfaces/surface_factory.h
+++ b/cc/surfaces/surface_factory.h
@@ -40,9 +40,13 @@ class CC_SURFACES_EXPORT SurfaceFactory
  public:
   using DrawCallback = base::Callback<void()>;
 
-  SurfaceFactory(SurfaceManager* manager, SurfaceFactoryClient* client);
+  SurfaceFactory(const FrameSinkId& frame_sink_id,
+                 SurfaceManager* manager,
+                 SurfaceFactoryClient* client);
   ~SurfaceFactory();
 
+  const FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
+
   void Create(const SurfaceId& surface_id);
   void Destroy(const SurfaceId& surface_id);
   void DestroyAll();
@@ -83,6 +87,7 @@ class CC_SURFACES_EXPORT SurfaceFactory
   void DidDestroySurfaceManager() { manager_ = nullptr; }
 
  private:
+  FrameSinkId frame_sink_id_;
   SurfaceManager* manager_;
   SurfaceFactoryClient* client_;
   SurfaceResourceHolder holder_;