cc: Remove things from OutputSurface and CompositorFrameSink.

cc/test/test_compositor_frame_sink.cc

 // Copyright 2016 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.
 
 #include "cc/test/test_compositor_frame_sink.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "cc/output/begin_frame_args.h"
@@ skipping 11 matching lines @@
     scoped_refptr<ContextProvider> compositor_context_provider,
     scoped_refptr<ContextProvider> worker_context_provider,
     std::unique_ptr<OutputSurface> display_output_surface,
     SharedBitmapManager* shared_bitmap_manager,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     const RendererSettings& renderer_settings,
     base::SingleThreadTaskRunner* task_runner,
     bool synchronous_composite,
     bool force_disable_reclaim_resources)
     : CompositorFrameSink(std::move(compositor_context_provider),
-                          std::move(worker_context_provider),
-                          nullptr),
+                          std::move(worker_context_provider)),
       surface_manager_(new SurfaceManager),
       surface_id_allocator_(new SurfaceIdAllocator(kCompositorClientId)),
       surface_factory_(new SurfaceFactory(surface_manager_.get(), this)),
       weak_ptrs_(this) {
   std::unique_ptr<SyntheticBeginFrameSource> begin_frame_source;
   std::unique_ptr<DisplayScheduler> scheduler;
   if (!synchronous_composite) {
     if (renderer_settings.disable_display_vsync) {
       begin_frame_source.reset(new BackToBackBeginFrameSource(
           base::MakeUnique<DelayBasedTimeSource>(task_runner)));
     } else {
       begin_frame_source.reset(new DelayBasedBeginFrameSource(
           base::MakeUnique<DelayBasedTimeSource>(task_runner)));
       begin_frame_source->SetAuthoritativeVSyncInterval(
           base::TimeDelta::FromMilliseconds(1000.f /
                                             renderer_settings.refresh_rate));
     }
     scheduler.reset(new DisplayScheduler(
         begin_frame_source.get(), task_runner,
         display_output_surface->capabilities().max_frames_pending));
   }
   const bool context_shared_with_compositor =
       display_output_surface->context_provider() == context_provider();
   display_.reset(
       new Display(shared_bitmap_manager, gpu_memory_buffer_manager,
                   renderer_settings, std::move(begin_frame_source),
                   std::move(display_output_surface), std::move(scheduler),
                   base::MakeUnique<TextureMailboxDeleter>(task_runner)));
 
-  capabilities_.delegated_rendering = true;
   // Since this CompositorFrameSink and the Display are tightly coupled and in
   // the same process/thread, the LayerTreeHostImpl can reclaim resources from
   // the Display. But we allow tests to disable this to mimic an out-of-process
   // Display.
   capabilities_.can_force_reclaim_resources = !force_disable_reclaim_resources;
   capabilities_.delegated_sync_points_required =
       !context_shared_with_compositor;
 }
 
 TestCompositorFrameSink::~TestCompositorFrameSink() {
@@ skipping 93 matching lines @@
 
 void TestCompositorFrameSink::ForceReclaimResources() {
   if (capabilities_.can_force_reclaim_resources &&
       !delegated_surface_id_.is_null()) {
     surface_factory_->SubmitCompositorFrame(delegated_surface_id_,
                                             CompositorFrame(),
                                             SurfaceFactory::DrawCallback());
   }
 }
 
-void TestCompositorFrameSink::BindFramebuffer() {
-  // This is a delegating output surface, no framebuffer/direct drawing support.
-  NOTREACHED();
-}
-
-uint32_t TestCompositorFrameSink::GetFramebufferCopyTextureFormat() {
-  // This is a delegating output surface, no framebuffer/direct drawing support.
-  NOTREACHED();
-  return 0;
-}
-
 void TestCompositorFrameSink::ReturnResources(
     const ReturnedResourceArray& resources) {
   client_->ReclaimResources(resources);
 }
 
 void TestCompositorFrameSink::SetBeginFrameSource(
     BeginFrameSource* begin_frame_source) {
   client_->SetBeginFrameSource(begin_frame_source);
 }
 
 void TestCompositorFrameSink::DisplayOutputSurfaceLost() {
   client_->DidLoseCompositorFrameSink();
 }
 
 void TestCompositorFrameSink::DisplayWillDrawAndSwap(
     bool will_draw_and_swap,
     const RenderPassList& render_passes) {
   if (test_client_)
     test_client_->DisplayWillDrawAndSwap(will_draw_and_swap, render_passes);
 }
 
 void TestCompositorFrameSink::DisplayDidDrawAndSwap() {
   if (test_client_)
     test_client_->DisplayDidDrawAndSwap();
 }
 
 }  // namespace cc