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

cc/test/fake_output_surface.h

Index: cc/test/fake_output_surface.h
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h
index ad91f081052ec392a038c6f87858018babc9482c..e985bcf5a9acf5b0d8bdbd89338d71c19a5e1585 100644
--- a/cc/test/fake_output_surface.h
+++ b/cc/test/fake_output_surface.h
@@ -28,14 +28,13 @@ class FakeOutputSurface : public OutputSurface {
 
   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(
@@ -54,15 +53,14 @@ class FakeOutputSurface : public OutputSurface {
 
   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() {
@@ -84,10 +82,9 @@ class FakeOutputSurface : public OutputSurface {
                               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(
@@ -126,8 +123,6 @@ class FakeOutputSurface : public OutputSurface {
   void BindFramebuffer() override;
   uint32_t GetFramebufferCopyTextureFormat() override;
 
-  void SetTreeActivationCallback(const base::Closure& callback);
-
   const TransferableResourceArray& resources_held_by_parent() {
     return resources_held_by_parent_;
   }
@@ -164,9 +159,6 @@ class FakeOutputSurface : public OutputSurface {
                     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,