Move test-only stuff from cc/debug/ to cc/test

cc/cc_tests.gyp

Index: cc/cc_tests.gyp
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 6d8ffc92002b75485b77431ab53d2ef26038b5c6..98f98d3c765521118527ffe866ad6bf4e8b441b0 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -113,14 +113,18 @@
       'test/fake_delegated_renderer_layer_impl.cc',
       'test/fake_delegated_renderer_layer_impl.h',
       'test/fake_impl_proxy.h',
+      'test/fake_layer_tree_host.cc',
+      'test/fake_layer_tree_host.h',
       'test/fake_layer_tree_host_client.cc',
       'test/fake_layer_tree_host_client.h',
       'test/fake_layer_tree_host_impl.cc',
+      'test/fake_layer_tree_host_impl.h',
       'test/fake_layer_tree_host_impl_client.cc',
       'test/fake_layer_tree_host_impl_client.h',
-      'test/fake_layer_tree_host_impl.h',
-      'test/fake_layer_tree_host.cc',
-      'test/fake_layer_tree_host.h',
+      'test/fake_output_surface.cc',
+      'test/fake_output_surface.h',
+      'test/fake_output_surface_client.cc',
+      'test/fake_output_surface_client.h',
       'test/fake_painted_scrollbar_layer.cc',
       'test/fake_painted_scrollbar_layer.h',
       'test/fake_picture_layer.cc',
@@ -134,56 +138,68 @@
       'test/fake_proxy.cc',
       'test/fake_proxy.h',
       'test/fake_rendering_stats_instrumentation.h',
+      'test/fake_scoped_ui_resource.cc',
+      'test/fake_scoped_ui_resource.h',
       'test/fake_scrollbar.cc',
       'test/fake_scrollbar.h',
       'test/fake_tile_manager.cc',
       'test/fake_tile_manager.h',
-      'test/fake_tile_manager_client.h',
       'test/fake_tile_manager_client.cc',
-      'test/fake_ui_resource_layer_tree_host_impl.h',
+      'test/fake_tile_manager_client.h',
       'test/fake_ui_resource_layer_tree_host_impl.cc',
-      'test/fake_output_surface.cc',
-      'test/fake_output_surface.h',
-      'test/fake_output_surface_client.cc',
-      'test/fake_output_surface_client.h',
-      'test/fake_scoped_ui_resource.cc',
-      'test/fake_scoped_ui_resource.h',
+      'test/fake_ui_resource_layer_tree_host_impl.h',
       'test/fake_video_frame_provider.cc',
       'test/fake_video_frame_provider.h',
+      'test/fake_web_graphics_context_3d.cc',
+      'test/fake_web_graphics_context_3d.h',
       'test/geometry_test_utils.cc',
       'test/geometry_test_utils.h',
       'test/impl_side_painting_settings.h',
       'test/layer_test_common.cc',
       'test/layer_test_common.h',
+      'test/layer_tree_json_parser.cc',
+      'test/layer_tree_json_parser.h',
       'test/layer_tree_pixel_test.cc',
       'test/layer_tree_pixel_test.h',
       'test/layer_tree_test.cc',
       'test/layer_tree_test.h',
-      'test/layer_tree_json_parser.cc',
-      'test/layer_tree_json_parser.h',
       'test/mock_quad_culler.cc',
       'test/mock_quad_culler.h',
       'test/occlusion_tracker_test_common.h',
+      'test/ordered_texture_map.cc',
+      'test/ordered_texture_map.h',
       'test/paths.cc',
       'test/paths.h',
+      'test/pixel_comparator.cc',
+      'test/pixel_comparator.h',
       'test/pixel_test.cc',
       'test/pixel_test.h',
       'test/pixel_test_output_surface.cc',
       'test/pixel_test_output_surface.h',
       'test/pixel_test_software_output_device.cc',
       'test/pixel_test_software_output_device.h',
+      'test/pixel_test_utils.cc',
+      'test/pixel_test_utils.h',
       'test/render_pass_test_common.cc',
       'test/render_pass_test_common.h',
       'test/render_pass_test_utils.cc',
       'test/render_pass_test_utils.h',
       'test/scheduler_test_common.cc',
       'test/scheduler_test_common.h',
-      'test/solid_color_content_layer_client.h',
-      'test/solid_color_content_layer_client.cc',
       'test/skia_common.cc',
       'test/skia_common.h',
+      'test/solid_color_content_layer_client.cc',
+      'test/solid_color_content_layer_client.h',
+      'test/test_context_provider.cc',
+      'test/test_context_provider.h',
+      'test/test_context_support.cc',
+      'test/test_context_support.h',
+      'test/test_texture.cc',
+      'test/test_texture.h',
       'test/test_tile_priorities.cc',
       'test/test_tile_priorities.h',
+      'test/test_web_graphics_context_3d.cc',
+      'test/test_web_graphics_context_3d.h',
       'test/tiled_layer_test_common.cc',
       'test/tiled_layer_test_common.h',
     ],
@@ -203,7 +219,6 @@
         '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
         'cc.gyp:cc',
         'cc_test_support',
-        'cc_test_utils',
       ],
       'sources': [
         'test/run_all_unittests.cc',
@@ -298,6 +313,8 @@
         '..',
       ],
       'dependencies': [
+        '../base/base.gyp:base',
+        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ -305,6 +322,7 @@
         '../third_party/mesa/mesa.gyp:osmesa',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gl/gl.gyp:gl',
+        '../ui/ui_unittests.gyp:ui_test_support',
       ],
       'sources': [
         '<@(cc_tests_support_files)',
@@ -312,24 +330,6 @@
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
-    {
-      'target_name': 'cc_test_utils',
-      'type': 'static_library',
-      'include_dirs': [
-        '..'
-      ],
-      'sources': [
-        'test/pixel_comparator.cc',
-        'test/pixel_comparator.h',
-        'test/pixel_test_utils.cc',
-        'test/pixel_test_utils.h',
-      ],
-      'dependencies': [
-        '../skia/skia.gyp:skia',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/ui_unittests.gyp:ui_test_support',
-      ],
-    },
   ],
   'conditions': [
     # Special target to wrap a gtest_target_type==shared_library