From 6be819007cc2f10c25b1203aec38ee9a73e5d23d Mon Sep 17 00:00:00 2001 From: mithro Date: Thu, 3 Dec 2015 21:58:46 -0800 Subject: cc: Move the MockBeginFrameObserver (and helper macros) into cc/test directory. This allows usage in other tests which interface with observers. The change also refactors the EXPECT_* macros so they can be used with further expectations and closer match the EXPECT_CALL form. The EXPECT_* macros also now work with a second implicit sequence such as; { ::testing::InSequence seq; EXPECT_BEGIN_FRAME_USED(obs, 100, 200, 300); EXPECT_CALL(other, Function()); EXPECT_BEGIN_FRAME_USED(obs, 400, 500, 600); } R=brianderson CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1493233002 Cr-Commit-Position: refs/heads/master@{#363147} --- cc/cc_tests.gyp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cc/cc_tests.gyp') diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index 03f8ae5..5332133 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -112,7 +112,9 @@ 'scheduler/delay_based_time_source_unittest.cc', 'scheduler/scheduler_state_machine_unittest.cc', 'scheduler/scheduler_unittest.cc', + 'test/begin_frame_source_test_unittest.cc', 'test/layer_tree_json_parser_unittest.cc', + 'test/mock_helper_unittest.cc', 'test/ordered_simple_task_runner_unittest.cc', 'test/test_web_graphics_context_3d_unittest.cc', 'tiles/picture_layer_tiling_set_unittest.cc', @@ -165,6 +167,8 @@ 'test/animation_timelines_test_common.h', 'test/begin_frame_args_test.cc', 'test/begin_frame_args_test.h', + 'test/begin_frame_source_test.cc', + 'test/begin_frame_source_test.h', 'test/failure_output_surface.cc', 'test/failure_output_surface.h', 'test/fake_content_layer_client.cc', @@ -236,6 +240,7 @@ 'test/layer_tree_settings_for_testing.h', 'test/layer_tree_test.cc', 'test/layer_tree_test.h', + 'test/mock_helper.h', 'test/mock_occlusion_tracker.h', 'test/ordered_simple_task_runner.cc', 'test/ordered_simple_task_runner.h', -- cgit v1.1