Revert of Decouple GpuCompositorFrameSink from DisplayCompositor

cc/surfaces/surface_manager.h

 // Copyright 2014 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 CC_SURFACES_SURFACE_MANAGER_H_
 #define CC_SURFACES_SURFACE_MANAGER_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 111 matching lines @@
                                   const FrameSinkId& child_frame_sink_id);
   void UnregisterFrameSinkHierarchy(const FrameSinkId& parent_frame_sink_id,
                                     const FrameSinkId& child_frame_sink_id);
 
   // SurfaceReferenceManager:
   const SurfaceId& GetRootSurfaceId() const override;
   void AddSurfaceReference(const SurfaceId& parent_id,
                            const SurfaceId& child_id) override;
   void RemoveSurfaceReference(const SurfaceId& parent_id,
                               const SurfaceId& child_id) override;
-  void AddSurfaceReferences(
-      const std::vector<SurfaceReference>& references) override;
-  void RemoveSurfaceReferences(
-      const std::vector<SurfaceReference>& references) override;
   size_t GetSurfaceReferenceCount(const SurfaceId& surface_id) const override;
   size_t GetReferencedSurfaceCount(const SurfaceId& surface_id) const override;
 
   scoped_refptr<SurfaceReferenceFactory> reference_factory() {
     return reference_factory_;
   }
 
  private:
   friend class SurfaceManagerRefTest;
 
@@ skipping 101 matching lines @@
       temp_references_;
 
   base::WeakPtrFactory<SurfaceManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_MANAGER_H_