Move frame_sink_id management to framesink_manager.cc/h from

cc/surfaces/display.cc

Index: cc/surfaces/display.cc
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index 2a83572c9f51d24f370648f2edf22be5a87d7eef..a3908b648d7d8705ce9debe09bd843f988d92657 100644
--- a/cc/surfaces/display.cc
+++ b/cc/surfaces/display.cc
@@ -18,6 +18,7 @@
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/display_scheduler.h"
+#include "cc/surfaces/framesink_manager.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_aggregator.h"
 #include "cc/surfaces/surface_manager.h"
@@ -61,7 +62,7 @@ Display::~Display() {
     if (auto* context = output_surface_->context_provider())
       context->SetLostContextCallback(base::Closure());
     if (begin_frame_source_)
-      surface_manager_->UnregisterBeginFrameSource(begin_frame_source_);
+      framesink_manager_->UnregisterBeginFrameSource(begin_frame_source_);
     surface_manager_->RemoveObserver(this);
   }
   if (aggregator_) {
@@ -74,19 +75,21 @@ Display::~Display() {
 }
 
 void Display::Initialize(DisplayClient* client,
-                         SurfaceManager* surface_manager) {
+                         SurfaceManager* surface_manager,
+                         FrameSinkManager* framesink_manager) {
   DCHECK(client);
   DCHECK(surface_manager);
   client_ = client;
   surface_manager_ = surface_manager;
+  framesink_manager_ = framesink_manager;
 
   surface_manager_->AddObserver(this);
 
   // This must be done in Initialize() so that the caller can delay this until
   // they are ready to receive a BeginFrameSource.
   if (begin_frame_source_) {
-    surface_manager_->RegisterBeginFrameSource(begin_frame_source_,
-                                               frame_sink_id_);
+    framesink_manager_->RegisterBeginFrameSource(begin_frame_source_,
+                                                 frame_sink_id_);
   }
 
   output_surface_->BindToClient(this);