cc: Remove things from OutputSurface and CompositorFrameSink.

cc/test/fake_compositor_frame_sink.cc

Index: cc/test/fake_compositor_frame_sink.cc
diff --git a/cc/test/fake_compositor_frame_sink.cc b/cc/test/fake_compositor_frame_sink.cc
index 760225faee9b61f187f8dfed079188bb4695bfd9..2907a1c66aa6f9a3c679fe65106356c93277da0f 100644
--- a/cc/test/fake_compositor_frame_sink.cc
+++ b/cc/test/fake_compositor_frame_sink.cc
@@ -15,23 +15,9 @@ namespace cc {
 
 FakeCompositorFrameSink::FakeCompositorFrameSink(
     scoped_refptr<ContextProvider> context_provider,
-    scoped_refptr<ContextProvider> worker_context_provider,
-    bool delegated_rendering)
-    : FakeCompositorFrameSink(std::move(context_provider),
-                              std::move(worker_context_provider),
-                              nullptr,
-                              delegated_rendering) {}
-
-FakeCompositorFrameSink::FakeCompositorFrameSink(
-    scoped_refptr<ContextProvider> context_provider,
-    scoped_refptr<ContextProvider> worker_context_provider,
-    std::unique_ptr<SoftwareOutputDevice> software_device,
-    bool delegated_rendering)
+    scoped_refptr<ContextProvider> worker_context_provider)
     : CompositorFrameSink(std::move(context_provider),
-                          std::move(worker_context_provider),
-                          std::move(software_device)) {
-  capabilities_.delegated_rendering = delegated_rendering;
-}
+                          std::move(worker_context_provider)) {}
 
 FakeCompositorFrameSink::~FakeCompositorFrameSink() = default;
 
@@ -66,22 +52,6 @@ void FakeCompositorFrameSink::SwapBuffers(CompositorFrame frame) {
   PostSwapBuffersComplete();
 }
 
-void FakeCompositorFrameSink::BindFramebuffer() {
-  if (framebuffer_) {
-    context_provider_->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER,
-                                                    framebuffer_);
-  } else {
-    CompositorFrameSink::BindFramebuffer();
-  }
-}
-
-uint32_t FakeCompositorFrameSink::GetFramebufferCopyTextureFormat() {
-  if (framebuffer_)
-    return framebuffer_format_;
-  else
-    return GL_RGB;
-}
-
 bool FakeCompositorFrameSink::BindToClient(CompositorFrameSinkClient* client) {
   if (CompositorFrameSink::BindToClient(client)) {
     client_ = client;
@@ -96,19 +66,6 @@ void FakeCompositorFrameSink::DetachFromClient() {
   CompositorFrameSink::DetachFromClient();
 }
 
-bool FakeCompositorFrameSink::HasExternalStencilTest() const {
-  return has_external_stencil_test_;
-}
-
-bool FakeCompositorFrameSink::SurfaceIsSuspendForRecycle() const {
-  return suspended_for_recycle_;
-}
-
-OverlayCandidateValidator*
-FakeCompositorFrameSink::GetOverlayCandidateValidator() const {
-  return overlay_candidate_validator_;
-}
-
 void FakeCompositorFrameSink::ReturnResourcesHeldByParent() {
   // Check |delegated_frame_data| because we shouldn't reclaim resources
   // for the Display which does not swap delegated frames.