Revert of Move surface reference code to CompositorFrameSinkSupport.

cc/surfaces/compositor_frame_sink_support.h

Index: cc/surfaces/compositor_frame_sink_support.h
diff --git a/cc/surfaces/compositor_frame_sink_support.h b/cc/surfaces/compositor_frame_sink_support.h
index ef8d2bf7b5f02aa281a563e7c330b8930c5a482e..eb63791e0aba5f6bcb32987af8544922aaf781d4 100644
--- a/cc/surfaces/compositor_frame_sink_support.h
+++ b/cc/surfaces/compositor_frame_sink_support.h
@@ -5,19 +5,14 @@
 #ifndef CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_
 #define CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_
 
-#include <memory>
-#include <unordered_set>
-
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/display_client.h"
-#include "cc/surfaces/referenced_surface_tracker.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
-#include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surfaces_export.h"
 
 namespace cc {
@@ -60,16 +55,6 @@
   Display* display() { return display_; }
 
  private:
-  // Update surface references with SurfaceManager for current CompositorFrame
-  // that has |local_surface_id|. UpdateReferences() must be called on
-  // |reference_tracker_| before calling this. Will add and remove top-level
-  // root references if |display_| is not null.
-  void UpdateSurfaceReferences(const SurfaceId& last_surface_id,
-                               const LocalSurfaceId& local_surface_id);
-
-  void AddTopLevelRootReference(const SurfaceId& surface_id);
-  void RemoveTopLevelRootReference(const SurfaceId& surface_id);
-
   void DidReceiveCompositorFrameAck();
 
   // DisplayClient implementation.
@@ -127,10 +112,6 @@
   // goes away and we can remove this bool.
   const bool handles_frame_sink_id_invalidation_;
 
-  // Track the surface references for the surface corresponding to this
-  // compositor frame sink.
-  ReferencedSurfaceTracker reference_tracker_;
-
   // The set of BeginFrame children of this CompositorFrameSink.
   std::unordered_set<FrameSinkId, FrameSinkIdHash> child_frame_sinks_;