Remove SurfaceReferenceManager interface.

services/ui/surfaces/display_compositor.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
 #define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 15 matching lines @@
 #include "ipc/ipc_channel_handle.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace gpu {
 class GpuMemoryBufferManager;
 class ImageFactory;
 }
 
 namespace cc {
 class Display;
-class SurfaceManager;
 class SyntheticBeginFrameSource;
 }
 
 namespace display_compositor {
 class GpuCompositorFrameSink;
 }
 
 namespace ui {
 
 // The DisplayCompositor object is an object global to the Window Server app
@@ skipping 46 matching lines @@
   void CreateCompositorFrameSinkInternal(
       const cc::FrameSinkId& frame_sink_id,
       gpu::SurfaceHandle surface_handle,
       std::unique_ptr<cc::Display> display,
       std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source,
       cc::mojom::MojoCompositorFrameSinkRequest request,
       cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client,
       cc::mojom::DisplayPrivateRequest display_private_request);
 
-  const cc::SurfaceId& GetRootSurfaceId() const;
-
   // cc::SurfaceObserver implementation.
   void OnSurfaceCreated(const cc::SurfaceInfo& surface_info) override;
   void OnSurfaceDamaged(const cc::SurfaceId& surface_id,
                         bool* changed) override;
 
   // SurfaceManager should be the first object constructed and the last object
   // destroyed in order to ensure that all other objects that depend on it have
   // access to a valid pointer for the entirety of their liftimes.
   cc::SurfaceManager manager_;
 
-  // Will normally point to |manager_| as it provides the interface. For tests
-  // it will be swapped out with a mock implementation.
-  cc::SurfaceReferenceManager* reference_manager_;
-
   scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_service_;
   std::unique_ptr<gpu::GpuMemoryBufferManager> gpu_memory_buffer_manager_;
   gpu::ImageFactory* image_factory_;
 
   std::unordered_map<
       cc::FrameSinkId,
       std::unique_ptr<display_compositor::GpuCompositorFrameSink>,
       cc::FrameSinkIdHash>
       compositor_frame_sinks_;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   base::ThreadChecker thread_checker_;
 
   cc::mojom::DisplayCompositorClientPtr client_;
   mojo::Binding<cc::mojom::DisplayCompositor> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayCompositor);
 };
 
 }  // namespace ui
 
 #endif  //  SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_