summaryrefslogtreecommitdiffstats
path: root/cc/cc_tests.gyp
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 00:29:30 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 00:29:30 +0000
commit1c0088fc6cfec7c21c20a147218f49b8e34e21c0 (patch)
tree4939597b2ca0d1357fa1f417a6a901159376854a /cc/cc_tests.gyp
parent57fe2460cc1baaaa66d691218de03b2cae77572b (diff)
downloadchromium_src-1c0088fc6cfec7c21c20a147218f49b8e34e21c0.zip
chromium_src-1c0088fc6cfec7c21c20a147218f49b8e34e21c0.tar.gz
chromium_src-1c0088fc6cfec7c21c20a147218f49b8e34e21c0.tar.bz2
Revert 162284 - cc: Get rid of CC*.h temporary header files.
BUG=155413 TEST=cc_unittests R=enne@chromium.org,jamesr@chromium.org Review URL: https://codereview.chromium.org/11145033 TBR=tfarina@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/cc_tests.gyp')
-rw-r--r--cc/cc_tests.gyp26
1 files changed, 13 insertions, 13 deletions
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 6360267..de65059 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -6,16 +6,13 @@
'variables': {
'chromium_code': 0,
'cc_tests_source_files': [
+ 'hash_pair_unittest.cc',
'active_animation_unittest.cc',
- 'content_layer_unittest.cc',
'damage_tracker_unittest.cc',
'delay_based_time_source_unittest.cc',
- 'delegated_renderer_layer_impl_unittest.cc',
'draw_quad_unittest.cc',
- 'float_quad_unittest.cc',
+ 'delegated_renderer_layer_impl_unittest.cc',
'frame_rate_controller_unittest.cc',
- 'gl_renderer_unittest.cc',
- 'hash_pair_unittest.cc',
'heads_up_display_unittest.cc',
'keyframed_animation_curve_unittest.cc',
'layer_animation_controller_unittest.cc',
@@ -26,33 +23,36 @@
'layer_tree_host_common_unittest.cc',
'layer_tree_host_impl_unittest.cc',
'layer_tree_host_unittest.cc',
- 'layer_unittest.cc',
'math_util_unittest.cc',
'occlusion_tracker_unittest.cc',
'prioritized_texture_unittest.cc',
'quad_culler_unittest.cc',
+ 'software_renderer_unittest.cc',
'render_pass_unittest.cc',
'render_surface_filters_unittest.cc',
'render_surface_unittest.cc',
+ 'gl_renderer_unittest.cc',
'resource_provider_unittest.cc',
'scheduler_state_machine_unittest.cc',
'scheduler_unittest.cc',
'scoped_texture_unittest.cc',
'scrollbar_animation_controller_linear_fade_unittest.cc',
- 'scrollbar_layer_unittest.cc',
- 'software_renderer_unittest.cc',
'solid_color_layer_impl_unittest.cc',
- 'texture_copier_unittest.cc',
- 'texture_layer_unittest.cc',
'texture_update_controller_unittest.cc',
'thread_task_unittest.cc',
- 'threaded_test.h',
'threaded_unittest.cc',
'threaded_unittest.h',
- 'throttled_texture_uploader_unittest.cc',
+ 'CCThreadedTest.h',
'tiled_layer_impl_unittest.cc',
- 'tiled_layer_unittest.cc',
'timer_unittest.cc',
+ 'content_layer_unittest.cc',
+ 'float_quad_unittest.cc',
+ 'layer_unittest.cc',
+ 'scrollbar_layer_unittest.cc',
+ 'texture_copier_unittest.cc',
+ 'texture_layer_unittest.cc',
+ 'throttled_texture_uploader_unittest.cc',
+ 'tiled_layer_unittest.cc',
'tree_synchronizer_unittest.cc',
],
'cc_tests_support_files': [