Move frame_sink_id management to framesink_manager.cc/h from

cc/surfaces/compositor_frame_sink_support.cc

Index: cc/surfaces/compositor_frame_sink_support.cc
diff --git a/cc/surfaces/compositor_frame_sink_support.cc b/cc/surfaces/compositor_frame_sink_support.cc
index 95222ed1defc2354e69faf20ac12300a4b439b61..86659d412b59d33ef47e9918e6f2be0f90f75bac 100644
--- a/cc/surfaces/compositor_frame_sink_support.cc
+++ b/cc/surfaces/compositor_frame_sink_support.cc
@@ -8,7 +8,7 @@
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/compositor_frame_sink_support_client.h"
 #include "cc/surfaces/display.h"
-#include "cc/surfaces/surface.h"
+#include "cc/surfaces/framesink_manager.h"
 #include "cc/surfaces/surface_manager.h"
 
 namespace cc {
@@ -16,21 +16,23 @@ namespace cc {
 CompositorFrameSinkSupport::CompositorFrameSinkSupport(
     CompositorFrameSinkSupportClient* client,
     SurfaceManager* surface_manager,
+    FrameSinkManager* framesink_manager,
     const FrameSinkId& frame_sink_id,
     std::unique_ptr<Display> display,
     std::unique_ptr<BeginFrameSource> display_begin_frame_source)
     : client_(client),
       surface_manager_(surface_manager),
+      framesink_manager_(framesink_manager),
       frame_sink_id_(frame_sink_id),
       display_begin_frame_source_(std::move(display_begin_frame_source)),
       display_(std::move(display)),
       surface_factory_(frame_sink_id_, surface_manager_, this),
       weak_factory_(this) {
-  surface_manager_->RegisterFrameSinkId(frame_sink_id_);
-  surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
+  framesink_manager_->RegisterFrameSinkId(frame_sink_id_);
+  framesink_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
 
   if (display_) {
-    display_->Initialize(this, surface_manager_);
+    display_->Initialize(this, surface_manager_, framesink_manager_);
     display_->SetVisible(true);
   }
 }
@@ -38,15 +40,15 @@ CompositorFrameSinkSupport::CompositorFrameSinkSupport(
 CompositorFrameSinkSupport::~CompositorFrameSinkSupport() {
   for (auto& child_frame_sink_id : child_frame_sinks_) {
     DCHECK(child_frame_sink_id.is_valid());
-    surface_manager_->UnregisterFrameSinkHierarchy(frame_sink_id_,
-                                                   child_frame_sink_id);
+    framesink_manager_->UnregisterFrameSinkHierarchy(frame_sink_id_,
+                                                    child_frame_sink_id);
   }
   // SurfaceFactory's destructor will attempt to return resources which will
   // call back into here and access |client_| so we should destroy
   // |surface_factory_|'s resources early on.
   surface_factory_.EvictSurface();
-  surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
-  surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
+  framesink_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
+  framesink_manager_->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 void CompositorFrameSinkSupport::EvictFrame() {
@@ -98,8 +100,8 @@ void CompositorFrameSinkSupport::DidReceiveCompositorFrameAck() {
 void CompositorFrameSinkSupport::AddChildFrameSink(
     const FrameSinkId& child_frame_sink_id) {
   child_frame_sinks_.insert(child_frame_sink_id);
-  surface_manager_->RegisterFrameSinkHierarchy(frame_sink_id_,
-                                               child_frame_sink_id);
+  framesink_manager_->RegisterFrameSinkHierarchy(frame_sink_id_,
+                                                 child_frame_sink_id);
 }
 
 void CompositorFrameSinkSupport::RemoveChildFrameSink(
@@ -107,8 +109,8 @@ void CompositorFrameSinkSupport::RemoveChildFrameSink(
   auto it = child_frame_sinks_.find(child_frame_sink_id);
   DCHECK(it != child_frame_sinks_.end());
   DCHECK(it->is_valid());
-  surface_manager_->UnregisterFrameSinkHierarchy(frame_sink_id_,
-                                                 child_frame_sink_id);
+  framesink_manager_->UnregisterFrameSinkHierarchy(frame_sink_id_,
+                                                   child_frame_sink_id);
   child_frame_sinks_.erase(it);
 }