Commit 226c080a authored by Fady Samuel's avatar Fady Samuel Committed by Commit Bot

viz: Move more unit tests to components/viz/service/frame_sinks

This CL moves surface_manager_ref_unittest to
components/viz/service/frame_sinks, renaming it to
surface_references_unittest to better capture what it does. This set
of unit tests operate at the Frame Sinks layer because they use
CompositorFrameSinkSupport but then interrogate SurfaceManager to ensure
references are tracked correctly.

This CL also updates includes, forward declarations and namespaces
appropriately.

Bug: 722935
Change-Id: If899a6a1a7a084a4afa077beef4d0bc44a6bc541
Reviewed-on: https://chromium-review.googlesource.com/574883Reviewed-by: default avatarAntoine Labour <piman@chromium.org>
Commit-Queue: Fady Samuel <fsamuel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487322}
parent 7ba40786
...@@ -832,7 +832,6 @@ cc_test("cc_unittests") { ...@@ -832,7 +832,6 @@ cc_test("cc_unittests") {
"animation/scroll_offset_animation_curve_unittest.cc", "animation/scroll_offset_animation_curve_unittest.cc",
"animation/transform_operations_unittest.cc", "animation/transform_operations_unittest.cc",
"surfaces/surface_hittest_unittest.cc", "surfaces/surface_hittest_unittest.cc",
"surfaces/surface_manager_ref_unittest.cc",
"surfaces/surface_unittest.cc", "surfaces/surface_unittest.cc",
# Setup. # Setup.
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
namespace viz { namespace viz {
namespace test { namespace test {
class SurfaceReferencesTest;
class SurfaceSynchronizationTest; class SurfaceSynchronizationTest;
} }
} // namespace viz } // namespace viz
...@@ -187,7 +188,7 @@ class CC_SURFACES_EXPORT SurfaceManager { ...@@ -187,7 +188,7 @@ class CC_SURFACES_EXPORT SurfaceManager {
private: private:
friend class viz::test::SurfaceSynchronizationTest; friend class viz::test::SurfaceSynchronizationTest;
friend class SurfaceManagerRefTest; friend class viz::test::SurfaceReferencesTest;
using SurfaceIdSet = std::unordered_set<viz::SurfaceId, viz::SurfaceIdHash>; using SurfaceIdSet = std::unordered_set<viz::SurfaceId, viz::SurfaceIdHash>;
......
...@@ -138,6 +138,7 @@ viz_source_set("unit_tests") { ...@@ -138,6 +138,7 @@ viz_source_set("unit_tests") {
"frame_sinks/direct_layer_tree_frame_sink_unittest.cc", "frame_sinks/direct_layer_tree_frame_sink_unittest.cc",
"frame_sinks/frame_sink_manager_unittest.cc", "frame_sinks/frame_sink_manager_unittest.cc",
"frame_sinks/referenced_surface_tracker_unittest.cc", "frame_sinks/referenced_surface_tracker_unittest.cc",
"frame_sinks/surface_references_unittest.cc",
"frame_sinks/surface_synchronization_unittest.cc", "frame_sinks/surface_synchronization_unittest.cc",
"hit_test/hit_test_aggregator_unittest.cc", "hit_test/hit_test_aggregator_unittest.cc",
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment