Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

content/browser/frame_host/render_widget_host_view_child_frame.h

Index: content/browser/frame_host/render_widget_host_view_child_frame.h
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.h b/content/browser/frame_host/render_widget_host_view_child_frame.h
index 8523114a3ad87fe7fe9a07348e390e64f783af30..8993a5a63c4c9418f75d5a6b297664b7de3d9cde 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.h
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.h
@@ -188,8 +188,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
   // to the frame tree.
   RenderWidgetHostViewBase* GetParentView();
 
-  void RegisterSurfaceNamespaceId();
-  void UnregisterSurfaceNamespaceId();
+  void RegisterFrameSinkId();
+  void UnregisterFrameSinkId();
 
  protected:
   friend class RenderWidgetHostView;
@@ -208,6 +208,9 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
   // The model object.
   RenderWidgetHostImpl* host_;
 
+  // The ID for FrameSink associated with this view.
+  cc::FrameSinkId frame_sink_id_;
+
   // Surface-related state.
   std::unique_ptr<cc::SurfaceIdAllocator> id_allocator_;
   std::unique_ptr<cc::SurfaceFactory> surface_factory_;