Revert of Decouple GpuCompositorFrameSink from DisplayCompositor

cc/surfaces/surface_manager.cc

Index: cc/surfaces/surface_manager.cc
diff --git a/cc/surfaces/surface_manager.cc b/cc/surfaces/surface_manager.cc
index 5bba1122214de45055477e8dd54f109c2b409e87..94bdac6aceaf9382966fc5dedcc45262303c0837 100644
--- a/cc/surfaces/surface_manager.cc
+++ b/cc/surfaces/surface_manager.cc
@@ -222,24 +222,6 @@
 
   RemoveSurfaceReferenceImpl(parent_id, child_id);
   GarbageCollectSurfaces();
-}
-
-void SurfaceManager::AddSurfaceReferences(
-    const std::vector<SurfaceReference>& references) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
-  for (const auto& reference : references)
-    AddSurfaceReference(reference.parent_id(), reference.child_id());
-}
-
-void SurfaceManager::RemoveSurfaceReferences(
-    const std::vector<SurfaceReference>& references) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
-  // TODO(kylechar): Each remove reference can trigger GC, it would be better if
-  // we GC only once if removing multiple references.
-  for (const auto& reference : references)
-    RemoveSurfaceReference(reference.parent_id(), reference.child_id());
 }
 
 size_t SurfaceManager::GetSurfaceReferenceCount(