Remove SurfaceFactory And SurfaceFactoryClient

cc/test/compositor_frame_helpers.h

Index: cc/test/compositor_frame_helpers.h
diff --git a/cc/test/compositor_frame_helpers.h b/cc/test/compositor_frame_helpers.h
index 1c23b69463025c778e310731aa86d0652b400af1..d0d6fb1b241836838c442e8af01a78ce6f55debc 100644
--- a/cc/test/compositor_frame_helpers.h
+++ b/cc/test/compositor_frame_helpers.h
@@ -5,6 +5,11 @@
 #ifndef CC_TEST_COMPOSITOR_FRAME_HELPERS_H_
 #define CC_TEST_COMPOSITOR_FRAME_HELPERS_H_
 
+#include <vector>
+
+#include "cc/resources/transferable_resource.h"
+#include "cc/surfaces/surface_id.h"
+
 namespace cc {
 
 class CompositorFrame;
@@ -13,6 +18,24 @@ namespace test {
 
 CompositorFrame MakeCompositorFrame();
 
+CompositorFrame MakeCompositorFrame(std::vector<SurfaceId> embedded_surfaces);
+
+CompositorFrame MakeCompositorFrame(std::vector<SurfaceId> embedded_surfaces,
+                                    std::vector<SurfaceId> referenced_surfaces);
+
+CompositorFrame MakeCompositorFrameWithResources(
+    std::vector<SurfaceId> embedded_surfaces,
+    TransferableResourceArray resource_list);
+
+TransferableResource MakeResource(ResourceId id,
+                                  ResourceFormat format,
+                                  uint32_t filter,
+                                  const gfx::Size& size);
+
+CompositorFrame MakeCompositorFrame(std::vector<SurfaceId> embedded_surfaces,
+                                    std::vector<SurfaceId> referenced_surfaces,
+                                    TransferableResourceArray resource_list);
+
 }  // namespace test
 }  // namespace cc