Revert 225857 "gfx: Create a separate gfx component out of ui."

trunk/src/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': 1,
     'cc_unit_tests_source_files': [
       'animation/animation_unittest.cc',
       'animation/keyframed_animation_curve_unittest.cc',
@@ skipping 274 matching lines @@
         '.',
         '..',
       ],
       'dependencies': [
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/WebKit/public/blink.gyp:blink_minimal',
         '../third_party/mesa/mesa.gyp:osmesa',
         '../ui/gl/gl.gyp:gl',
-        '../ui/gfx/gfx.gyp:gfx',
         '../ui/ui.gyp:ui',
       ],
       'sources': [
         '<@(cc_tests_support_files)',
       ],
       # 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.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': [
           {
@@ skipping 18 matching lines @@
               'test_suite_name': 'cc_perftests',
               'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)cc_perftests<(SHARED_LIB_SUFFIX)',
             },
             'includes': [ '../build/apk_test.gypi' ],
           },
         ],
       }
     ]
   ],
 }