Move frame_sink_id management to framesink_manager.cc/h from

content/browser/frame_host/render_widget_host_view_child_frame.cc

Index: content/browser/frame_host/render_widget_host_view_child_frame.cc
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc
index 5cd64b8dee19495d12278d38b548fdae6dbd6aed..514abb8fa09872a424e5619b47fd3d9bac1f95d0 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.cc
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc
@@ -61,16 +61,17 @@ RenderWidgetHostViewChildFrame::RenderWidgetHostViewChildFrame(
       begin_frame_source_(nullptr),
       weak_factory_(this) {
   id_allocator_.reset(new cc::SurfaceIdAllocator());
+  auto* framesink_manager = GetFrameSinkManager();
   auto* manager = GetSurfaceManager();
-  manager->RegisterFrameSinkId(frame_sink_id_);
+   framesink_manager->RegisterFrameSinkId(frame_sink_id_);
   surface_factory_ =
       base::MakeUnique<cc::SurfaceFactory>(frame_sink_id_, manager, this);
 }
 
 RenderWidgetHostViewChildFrame::~RenderWidgetHostViewChildFrame() {
   surface_factory_->EvictSurface();
-  if (GetSurfaceManager())
-    GetSurfaceManager()->InvalidateFrameSinkId(frame_sink_id_);
+  if (GetFrameSinkManager())
+    GetFrameSinkManager()->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 void RenderWidgetHostViewChildFrame::Init() {
@@ -86,12 +87,12 @@ void RenderWidgetHostViewChildFrame::SetCrossProcessFrameConnector(
 
   if (frame_connector_) {
     if (parent_frame_sink_id_.is_valid()) {
-      GetSurfaceManager()->UnregisterFrameSinkHierarchy(parent_frame_sink_id_,
-                                                        frame_sink_id_);
+      GetFrameSinkManager()->UnregisterFrameSinkHierarchy(parent_frame_sink_id_,
+                                                          frame_sink_id_);
     }
     // Unregister the client here, as it is not guaranteed in tests that the
     // destructor will be called.
-    GetSurfaceManager()->UnregisterSurfaceFactoryClient(frame_sink_id_);
+    GetFrameSinkManager()->UnregisterSurfaceFactoryClient(frame_sink_id_);
 
     parent_frame_sink_id_ = cc::FrameSinkId();
 
@@ -104,14 +105,14 @@ void RenderWidgetHostViewChildFrame::SetCrossProcessFrameConnector(
   }
   frame_connector_ = frame_connector;
   if (frame_connector_) {
-    GetSurfaceManager()->RegisterSurfaceFactoryClient(frame_sink_id_, this);
+    GetFrameSinkManager()->RegisterSurfaceFactoryClient(frame_sink_id_, this);
     RenderWidgetHostViewBase* parent_view =
         frame_connector_->GetParentRenderWidgetHostView();
     if (parent_view) {
       parent_frame_sink_id_ = parent_view->GetFrameSinkId();
       DCHECK(parent_frame_sink_id_.is_valid());
-      GetSurfaceManager()->RegisterFrameSinkHierarchy(parent_frame_sink_id_,
-                                                      frame_sink_id_);
+      GetFrameSinkManager()->RegisterFrameSinkHierarchy(parent_frame_sink_id_,
+                                                        frame_sink_id_);
     }
   }
 }