Reland "Move a good set of gfx unit tests into gfx_unittests target."

ui/ui_unittests.gyp

 # Copyright 2013 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,
   },
   'targets': [
     {
@@ skipping 22 matching lines @@
         'base/layout_unittest.cc',
         'base/l10n/l10n_util_mac_unittest.mm',
         'base/l10n/l10n_util_unittest.cc',
         'base/l10n/l10n_util_win_unittest.cc',
         'base/l10n/time_format_unittest.cc',
         'base/models/tree_node_iterator_unittest.cc',
         'base/resource/data_pack_literal.cc',
         'base/resource/data_pack_unittest.cc',
         'base/resource/resource_bundle_unittest.cc',
         'base/test/run_all_unittests.cc',
-        'gfx/font_unittest.cc',
-        'gfx/image/image_skia_unittest.cc',
         'gfx/screen_unittest.cc',
-        'gfx/text_elider_unittest.cc',
-        'gfx/text_utils_unittest.cc',
       ],
       'all_sources': [
         '<@(_common_sources)',
         'base/accelerators/accelerator_manager_unittest.cc',
         'base/accelerators/menu_label_accelerator_util_linux_unittest.cc',
         'base/clipboard/clipboard_unittest.cc',
         'base/clipboard/custom_data_helper_unittest.cc',
         'base/cocoa/base_view_unittest.mm',
         'base/cocoa/cocoa_base_utils_unittest.mm',
         'base/cocoa/controls/blue_label_button_unittest.mm',
@@ skipping 77 matching lines @@
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         }],
         ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
         ['use_pango == 1', {
           'dependencies': [
-            '../build/linux/system.gyp:fontconfig',
             '../build/linux/system.gyp:pangocairo',
           ],
-          'sources': [
-            'gfx/platform_font_pango_unittest.cc',
-          ],
           'conditions': [
             ['use_allocator!="none"', {
                'dependencies': [
                  '../base/allocator/allocator.gyp:allocator',
                ],
             }],
           ],
         }],
         ['use_x11==1', {
           'dependencies': [
@@ skipping 40 matching lines @@
             'gfx/screen_unittest.cc',
           ],
         }],
         ['use_ozone==1', {
           'dependencies': [
             'gfx/ozone/gfx_ozone.gyp:gfx_ozone',
           ],
         }],
         ['use_ozone==1 and use_pango==0', {
           'sources!': [
-            'gfx/text_elider_unittest.cc',
-            'gfx/font_unittest.cc',
+            'gfx/canvas_unittest.cc',
             'gfx/font_list_unittest.cc',
             'gfx/render_text_unittest.cc',
-            'gfx/canvas_unittest.cc',
           ],
         }],
         ['chromeos==1', {
           'dependencies': [
             '../chromeos/chromeos.gyp:chromeos',
             'aura/aura.gyp:aura_test_support',
             'chromeos/ui_chromeos.gyp:ui_chromeos',
           ],
           'sources': [
             'chromeos/touch_exploration_controller_unittest.cc'
@@ skipping 38 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'ui_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }