Remove SurfaceFactory And SurfaceFactoryClient

cc/test/compositor_frame_helpers.h

 // Copyright 2017 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_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;
 
 namespace test {
 
 CompositorFrame MakeCompositorFrame();
 
+CompositorFrame MakeCompositorFrame(std::vector<SurfaceId> embedded_surfaces,
+                                    std::vector<SurfaceId> referenced_surfaces,
+                                    TransferableResourceArray resource_list);
+
 }  // namespace test
 }  // namespace cc
 
 #endif  // CC_TEST_COMPOSITOR_FRAME_HELPERS_H_