Revert 171544

cc/cc_tests.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 0,
     'cc_unit_tests_source_files': [
       'active_animation_unittest.cc',
       'content_layer_unittest.cc',
       'contents_scaling_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',
       'frame_rate_controller_unittest.cc',
       'gl_renderer_unittest.cc',
-      'gl_renderer_pixeltest.cc',
       'hash_pair_unittest.cc',
       'heads_up_display_unittest.cc',
       'keyframed_animation_curve_unittest.cc',
       'layer_animation_controller_unittest.cc',
       'layer_impl_unittest.cc',
       'layer_iterator_unittest.cc',
       'layer_quad_unittest.cc',
       'layer_sorter_unittest.cc',
       'layer_tree_host_common_unittest.cc',
       'layer_tree_host_impl_unittest.cc',
@@ skipping 50 matching lines @@
       'test/fake_web_scrollbar_theme_geometry.h',
       'test/geometry_test_utils.cc',
       'test/geometry_test_utils.h',
       'test/layer_test_common.cc',
       'test/layer_test_common.h',
       'test/layer_tree_test_common.cc',
       'test/layer_tree_test_common.h',
       'test/mock_quad_culler.cc',
       'test/mock_quad_culler.h',
       'test/occlusion_tracker_test_common.h',
-      'test/paths.cc',
-      'test/paths.h',
-      'test/pixel_test_output_surface.cc',
-      'test/pixel_test_output_surface.h',
       'test/render_pass_test_common.cc',
       'test/render_pass_test_common.h',
       'test/scheduler_test_common.cc',
       'test/scheduler_test_common.h',
       'test/tiled_layer_test_common.cc',
       'test/tiled_layer_test_common.h',
     ],
   },
   'targets': [
     {
       'target_name': 'cc_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:test_support_base',
         '../media/media.gyp:media',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/ui.gyp:ui',
-        '../webkit/support/webkit_support.gyp:webkit_gpu',
         'cc.gyp:cc',
         'cc_test_support',
-        'cc_test_utils',
       ],
       'sources': [
         'test/run_all_unittests.cc',
         '<@(cc_unit_tests_source_files)',
       ],
       'include_dirs': [
         'test',
         '.',
         '../third_party/WebKit/Source/Platform/chromium',
       ],
@@ skipping 38 matching lines @@
     {
       'target_name': 'cc_test_support',
       'type': 'static_library',
       'include_dirs': [
         'test',
         '.',
         '..',
         '../third_party/WebKit/Source/Platform/chromium',
       ],
       'dependencies': [
+        '../ui/gl/gl.gyp:gl',
+        '../testing/gtest.gyp:gtest',
+        '../testing/gmock.gyp:gmock',
         '../skia/skia.gyp:skia',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-        '../third_party/mesa/mesa.gyp:osmesa',
-        '../ui/gl/gl.gyp:gl',
       ],
       'sources': [
         '<@(cc_tests_support_files)',
       ],
     },
-    {
-      'target_name': 'cc_test_utils',
-      'type': 'static_library',
-      'include_dirs': [
-        '..'
-      ],
-      'sources': [
-        'test/pixel_test_utils.cc',
-        'test/pixel_test_utils.h',
-      ],
-      'dependencies': [
-        '../skia/skia.gyp:skia',
-        '../ui/ui.gyp:ui',  # for png_codec
-      ],
-    },
   ],
   'conditions': [
     # Special target to wrap a gtest_target_type==shared_library
     # cc_unittests into an android apk for execution.
     ['OS == "android" and gtest_target_type == "shared_library"', {
       'targets': [
         {
           'target_name': 'cc_unittests_apk',
           'type': 'none',
           'dependencies': [
@@ skipping 18 matching lines @@
           'variables': {
             'test_suite_name': 'cc_perftests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)cc_perftests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }]
   ],
 }