Remove SurfaceFactory And SurfaceFactoryClient

cc/test/compositor_frame_helpers.cc

 // 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.
 
 #include "cc/test/compositor_frame_helpers.h"
+
 #include "cc/output/compositor_frame.h"
 
 namespace cc {
 namespace test {
 
 CompositorFrame MakeCompositorFrame() {
   CompositorFrame frame;
   frame.metadata.begin_frame_ack.source_id = BeginFrameArgs::kManualSourceId;
   frame.metadata.begin_frame_ack.sequence_number =
       BeginFrameArgs::kStartingFrameNumber;
   return frame;
 }
 
+CompositorFrame MakeCompositorFrame(std::vector<SurfaceId> embedded_surfaces) {
+  return MakeCompositorFrame(embedded_surfaces, embedded_surfaces,

[danakj, 2017/05/03 16:08:39]

You could copy once to a local, and move both, instead of making 2 copies (this
would have 3 vectors with the same data in them instead of 2 atm)

[Alex Z., 2017/05/03 18:07:37]

This function is removed.

+                             TransferableResourceArray());
+}
+
+CompositorFrame MakeCompositorFrame(
+    std::vector<SurfaceId> embedded_surfaces,
+    std::vector<SurfaceId> referenced_surfaces) {
+  return MakeCompositorFrame(std::move(embedded_surfaces),
+                             std::move(referenced_surfaces),
+                             TransferableResourceArray());
+}
+
+CompositorFrame MakeCompositorFrameWithResources(
+    std::vector<SurfaceId> embedded_surfaces,
+    TransferableResourceArray resource_list) {
+  return MakeCompositorFrame(embedded_surfaces, embedded_surfaces,
+                             std::move(resource_list));
+}
+
+TransferableResource MakeResource(ResourceId id,
+                                  ResourceFormat format,
+                                  uint32_t filter,
+                                  const gfx::Size& size) {
+  TransferableResource resource;
+  resource.id = id;
+  resource.format = format;
+  resource.filter = filter;
+  resource.size = size;
+  return resource;
+}
+
+CompositorFrame MakeCompositorFrame(std::vector<SurfaceId> embedded_surfaces,
+                                    std::vector<SurfaceId> referenced_surfaces,
+                                    TransferableResourceArray resource_list) {
+  CompositorFrame compositor_frame;
+  compositor_frame.metadata.begin_frame_ack = BeginFrameAck(0, 1, 1, true);
+  compositor_frame.metadata.embedded_surfaces = std::move(embedded_surfaces);
+  compositor_frame.metadata.referenced_surfaces =
+      std::move(referenced_surfaces);
+  compositor_frame.resource_list = std::move(resource_list);
+  return compositor_frame;
+}
+
 }  // namespace test
 }  // namespace cc