cc: Remove things from OutputSurface and CompositorFrameSink.

cc/test/fake_output_surface.cc

 // Copyright 2012 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/fake_output_surface.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 
 FakeOutputSurface::FakeOutputSurface(
-    scoped_refptr<ContextProvider> context_provider,
-    scoped_refptr<ContextProvider> worker_context_provider,
-    bool delegated_rendering)
-    : FakeOutputSurface(std::move(context_provider),
-                        std::move(worker_context_provider),
-                        nullptr,
-                        delegated_rendering) {}
+    scoped_refptr<ContextProvider> context_provider)
+    : OutputSurface(std::move(context_provider)) {}
 
 FakeOutputSurface::FakeOutputSurface(
-    scoped_refptr<ContextProvider> context_provider,
-    scoped_refptr<ContextProvider> worker_context_provider,
-    std::unique_ptr<SoftwareOutputDevice> software_device,
-    bool delegated_rendering)
-    : OutputSurface(std::move(context_provider),
-                    std::move(worker_context_provider),
-                    std::move(software_device)) {
-  capabilities_.delegated_rendering = false;
-}
+    std::unique_ptr<SoftwareOutputDevice> software_device)
+    : OutputSurface(std::move(software_device)) {}
 
 FakeOutputSurface::~FakeOutputSurface() = default;
 
 void FakeOutputSurface::SwapBuffers(CompositorFrame frame) {
   ReturnResourcesHeldByParent();
 
   last_sent_frame_.reset(new CompositorFrame(std::move(frame)));
   ++num_sent_frames_;
 
   if (last_sent_frame_->delegated_frame_data) {
@@ skipping 71 matching lines @@
     // Return the last frame's resources immediately.
     ReturnedResourceArray resources;
     for (const auto& resource : resources_held_by_parent_)
       resources.push_back(resource.ToReturnedResource());
     resources_held_by_parent_.clear();
     client_->ReclaimResources(resources);
   }
 }
 
 }  // namespace cc