Revert 171544

cc/cc_tests.gyp

Index: cc/cc_tests.gyp
===================================================================
--- cc/cc_tests.gyp	(revision 171555)
+++ cc/cc_tests.gyp	(working copy)
@@ -16,7 +16,6 @@
       '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',
@@ -87,10 +86,6 @@
       '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',
@@ -110,10 +105,8 @@
         '../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',
@@ -172,32 +165,16 @@
         '../third_party/WebKit/Source/Platform/chromium',
       ],
       'dependencies': [
-        '../skia/skia.gyp:skia',
-        '../testing/gmock.gyp:gmock',
+        '../ui/gl/gl.gyp:gl',
         '../testing/gtest.gyp:gtest',
+        '../testing/gmock.gyp:gmock',
+        '../skia/skia.gyp:skia',
         '../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