Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

content/browser/renderer_host/delegated_frame_host.h

Index: content/browser/renderer_host/delegated_frame_host.h
diff --git a/content/browser/renderer_host/delegated_frame_host.h b/content/browser/renderer_host/delegated_frame_host.h
index 97a5ffd016f403134f78bfe39c303b9e9a126307..244efca1e1ea89b567e155eb680538629405b6fe 100644
--- a/content/browser/renderer_host/delegated_frame_host.h
+++ b/content/browser/renderer_host/delegated_frame_host.h
@@ -91,7 +91,8 @@ class CONTENT_EXPORT DelegatedFrameHost
       public cc::SurfaceFactoryClient,
       public base::SupportsWeakPtr<DelegatedFrameHost> {
  public:
-  explicit DelegatedFrameHost(DelegatedFrameHostClient* client);
+  DelegatedFrameHost(const cc::FrameSinkId& frame_sink_id,
+                     DelegatedFrameHostClient* client);
   ~DelegatedFrameHost() override;
 
   // ui::CompositorObserver implementation.
@@ -247,6 +248,7 @@ class CONTENT_EXPORT DelegatedFrameHost
   // initiate a copy-into-video-frame request.
   void AttemptFrameSubscriberCapture(const gfx::Rect& damage_rect);
 
+  const cc::FrameSinkId frame_sink_id_;
   DelegatedFrameHostClient* const client_;
   ui::Compositor* compositor_;