cc: Get rid of non-delegated rendering in most cc unit tests.

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) {}
 
 FakeOutputSurface::FakeOutputSurface(
-    std::unique_ptr<SoftwareOutputDevice> software_device,
-    bool delegated_rendering)
-    : FakeOutputSurface(nullptr,
-                        nullptr,
-                        std::move(software_device),
-                        delegated_rendering) {}
-
-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 = delegated_rendering;
 }
 
@@ skipping 57 matching lines @@
   } else {
     return false;
   }
 }
 
 void FakeOutputSurface::DetachFromClient() {
   ReturnResourcesHeldByParent();
   OutputSurface::DetachFromClient();
 }
 
-void FakeOutputSurface::SetTreeActivationCallback(
-    const base::Closure& callback) {
-  DCHECK(client_);
-  client_->SetTreeActivationCallback(callback);
-}
-
 bool FakeOutputSurface::HasExternalStencilTest() const {
   return has_external_stencil_test_;
 }
 
 bool FakeOutputSurface::SurfaceIsSuspendForRecycle() const {
   return suspended_for_recycle_;
 }
 
 OverlayCandidateValidator* FakeOutputSurface::GetOverlayCandidateValidator()
     const {
@@ skipping 12 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