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 c60de21ebdfc5f12f3517a87e2b7ce56ea60e5ec..32356e65d95dba9ef2efca041d24d4e3773cc0db 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;
@@ -18,6 +23,11 @@ CompositorFrame MakeCompositorFrame();
 // initialized.
 CompositorFrame MakeEmptyCompositorFrame();
 
+CompositorFrame MakeCompositorFrame(
+    std::vector<SurfaceId> activation_dependencies,
+    std::vector<SurfaceId> referenced_surfaces,
+    TransferableResourceArray resource_list);
+
 }  // namespace test
 }  // namespace cc