Moving temporary reference logic to SurfaceManager

services/ui/surfaces/display_compositor.h

Index: services/ui/surfaces/display_compositor.h
diff --git a/services/ui/surfaces/display_compositor.h b/services/ui/surfaces/display_compositor.h
index fca74d8a19cde7f871ecb6ad92a848e36ded099f..cac807c36c3344511dce9363bce7a033cbb95a88 100644
--- a/services/ui/surfaces/display_compositor.h
+++ b/services/ui/surfaces/display_compositor.h
@@ -38,11 +38,6 @@ class SyntheticBeginFrameSource;
 
 namespace ui {
 
-namespace test {
-class DisplayCompositorTest;
-}
-
-class DisplayCompositorClient;
 class GpuCompositorFrameSink;
 
 // The DisplayCompositor object is an object global to the Window Server app
@@ -97,11 +92,6 @@ class DisplayCompositor : public cc::SurfaceObserver,
       cc::mojom::MojoCompositorFrameSinkClientPtr client) override;
 
  private:
-  friend class test::DisplayCompositorTest;
-
-  void AddSurfaceReference(const cc::SurfaceReference& ref);
-  void RemoveSurfaceReference(const cc::SurfaceReference& ref);
-
   std::unique_ptr<cc::Display> CreateDisplay(
       const cc::FrameSinkId& frame_sink_id,
       gpu::SurfaceHandle surface_handle,
@@ -144,16 +134,6 @@ class DisplayCompositor : public cc::SurfaceObserver,
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
-  // SurfaceIds that have temporary references from top level root so they
-  // aren't GC'd before DisplayCompositorClient can add a real reference. This
-  // is basically a collection of surface ids, for example:
-  //   cc::SurfaceId surface_id(key, value[index]);
-  // The LocalFrameIds are stored in the order the surfaces are created in.
-  std::unordered_map<cc::FrameSinkId,
-                     std::vector<cc::LocalFrameId>,
-                     cc::FrameSinkIdHash>
-      temp_references_;
-
   base::ThreadChecker thread_checker_;
 
   cc::mojom::DisplayCompositorClientPtr client_;