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

cc/test/fake_output_surface.h

 // 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.
 
 #ifndef CC_TEST_FAKE_OUTPUT_SURFACE_H_
 #define CC_TEST_FAKE_OUTPUT_SURFACE_H_
 
 #include <stddef.h>
 
 #include "base/callback.h"
@@ skipping 10 matching lines @@
 #include "cc/test/test_web_graphics_context_3d.h"
 
 namespace cc {
 
 class FakeOutputSurface : public OutputSurface {
  public:
   ~FakeOutputSurface() override;
 
   static std::unique_ptr<FakeOutputSurface> Create3d() {
     return base::WrapUnique(
-        new FakeOutputSurface(TestContextProvider::Create(),
-                              TestContextProvider::CreateWorker(), false));
+        new FakeOutputSurface(TestContextProvider::Create(), nullptr, false));
   }
 
   static std::unique_ptr<FakeOutputSurface> Create3d(
       scoped_refptr<ContextProvider> context_provider) {
-    return base::WrapUnique(new FakeOutputSurface(
-        context_provider, TestContextProvider::CreateWorker(), false));
+    return base::WrapUnique(
+        new FakeOutputSurface(context_provider, nullptr, false));
   }
 
   static std::unique_ptr<FakeOutputSurface> Create3d(
       scoped_refptr<ContextProvider> context_provider,
       scoped_refptr<ContextProvider> worker_context_provider) {
     return base::WrapUnique(new FakeOutputSurface(
         context_provider, worker_context_provider, false));
   }
 
   static std::unique_ptr<FakeOutputSurface> Create3d(
       std::unique_ptr<TestGLES2Interface> gl) {
     return base::WrapUnique(
         new FakeOutputSurface(TestContextProvider::Create(std::move(gl)),
                               TestContextProvider::CreateWorker(), false));
   }
 
   static std::unique_ptr<FakeOutputSurface> Create3d(
       std::unique_ptr<TestWebGraphicsContext3D> context) {
-    return base::WrapUnique(
-        new FakeOutputSurface(TestContextProvider::Create(std::move(context)),
-                              TestContextProvider::CreateWorker(), false));
+    return base::WrapUnique(new FakeOutputSurface(
+        TestContextProvider::Create(std::move(context)), nullptr, false));
   }
 
   static std::unique_ptr<FakeOutputSurface> CreateSoftware(
       std::unique_ptr<SoftwareOutputDevice> software_device) {
-    return base::WrapUnique(
-        new FakeOutputSurface(std::move(software_device), false));
+    return base::WrapUnique(new FakeOutputSurface(
+        nullptr, nullptr, std::move(software_device), false));
   }
 
   static std::unique_ptr<FakeOutputSurface> CreateDelegating3d() {
     return base::WrapUnique(
         new FakeOutputSurface(TestContextProvider::Create(),
                               TestContextProvider::CreateWorker(), true));
   }
 
   static std::unique_ptr<FakeOutputSurface> CreateDelegating3d(
       scoped_refptr<TestContextProvider> context_provider) {
     return base::WrapUnique(new FakeOutputSurface(
         context_provider, TestContextProvider::CreateWorker(), true));
   }
 
   static std::unique_ptr<FakeOutputSurface> CreateDelegating3d(
       std::unique_ptr<TestWebGraphicsContext3D> context) {
     return base::WrapUnique(
         new FakeOutputSurface(TestContextProvider::Create(std::move(context)),
                               TestContextProvider::CreateWorker(), true));
   }
 
-  static std::unique_ptr<FakeOutputSurface> CreateDelegatingSoftware(
-      std::unique_ptr<SoftwareOutputDevice> software_device) {
+  static std::unique_ptr<FakeOutputSurface> CreateDelegatingSoftware() {
     return base::WrapUnique(
-        new FakeOutputSurface(std::move(software_device), true));
+        new FakeOutputSurface(nullptr, nullptr, nullptr, true));
   }
 
   static std::unique_ptr<FakeOutputSurface> CreateNoRequireSyncPoint(
       std::unique_ptr<TestWebGraphicsContext3D> context) {
     std::unique_ptr<FakeOutputSurface> surface(Create3d(std::move(context)));
     surface->capabilities_.delegated_sync_points_required = false;
     return surface;
   }
 
   static std::unique_ptr<FakeOutputSurface> CreateOffscreen(
@@ skipping 18 matching lines @@
   bool BindToClient(OutputSurfaceClient* client) override;
   void DetachFromClient() override;
 
   void set_framebuffer(GLint framebuffer, GLenum format) {
     framebuffer_ = framebuffer;
     framebuffer_format_ = format;
   }
   void BindFramebuffer() override;
   uint32_t GetFramebufferCopyTextureFormat() override;
 
-  void SetTreeActivationCallback(const base::Closure& callback);
-
   const TransferableResourceArray& resources_held_by_parent() {
     return resources_held_by_parent_;
   }
 
   bool HasExternalStencilTest() const override;
 
   bool SurfaceIsSuspendForRecycle() const override;
 
   OverlayCandidateValidator* GetOverlayCandidateValidator() const override;
   void SetOverlayCandidateValidator(OverlayCandidateValidator* validator) {
@@ skipping 16 matching lines @@
     return last_swap_rect_;
   }
 
   void ReturnResourcesHeldByParent();
 
  protected:
   FakeOutputSurface(scoped_refptr<ContextProvider> context_provider,
                     scoped_refptr<ContextProvider> worker_context_provider,
                     bool delegated_rendering);
 
-  FakeOutputSurface(std::unique_ptr<SoftwareOutputDevice> software_device,
-                    bool delegated_rendering);
-
   FakeOutputSurface(scoped_refptr<ContextProvider> context_provider,
                     scoped_refptr<ContextProvider> worker_context_provider,
                     std::unique_ptr<SoftwareOutputDevice> software_device,
                     bool delegated_rendering);
 
   OutputSurfaceClient* client_ = nullptr;
   std::unique_ptr<CompositorFrame> last_sent_frame_;
   size_t num_sent_frames_ = 0;
   bool has_external_stencil_test_ = false;
   bool suspended_for_recycle_ = false;
   GLint framebuffer_ = 0;
   GLenum framebuffer_format_ = 0;
   TransferableResourceArray resources_held_by_parent_;
   std::unique_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind_;
   OverlayCandidateValidator* overlay_candidate_validator_ = nullptr;
   bool last_swap_rect_valid_ = false;
   gfx::Rect last_swap_rect_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_FAKE_OUTPUT_SURFACE_H_