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

ui/gfx/gfx.gyp

Index: ui/gfx/gfx.gyp
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
index 2e45f8bbffe0b61ffb2297263444933e66efc443..53ba237ed84a999dcb996f366019536a091204dc 100644
--- a/ui/gfx/gfx.gyp
+++ b/ui/gfx/gfx.gyp
@@ -372,6 +372,7 @@
         }],
         ['use_x11==1', {
           'dependencies': [
+            '../../build/linux/system.gyp:x11',
             'x/gfx_x11.gyp:gfx_x11',
           ],
         }],
@@ -438,97 +439,6 @@
         }],
       ],
     },
-    {
-      'target_name': 'gfx_unittests',
-      'type': '<(gtest_target_type)',
-      # iOS uses a small subset of ui. common_sources are the only files that
-      # are built on iOS.
-      'common_sources' : [
-        'image/image_family_unittest.cc',
-        'image/image_unittest.cc',
-        'image/image_unittest_util.cc',
-        'image/image_unittest_util.h',
-        'image/image_unittest_util_ios.mm',
-        'image/image_unittest_util_mac.mm',
-      ],
-      'all_sources': [
-        '<@(_common_sources)',
-        'animation/animation_container_unittest.cc',
-        'animation/animation_unittest.cc',
-        'animation/multi_animation_unittest.cc',
-        'animation/slide_animation_unittest.cc',
-        'animation/tween_unittest.cc',
-        'blit_unittest.cc',
-        'break_list_unittest.cc',
-        'codec/jpeg_codec_unittest.cc',
-        'codec/png_codec_unittest.cc',
-        'color_analysis_unittest.cc',
-        'color_utils_unittest.cc',
-        'display_unittest.cc',
-        'geometry/box_unittest.cc',
-        'geometry/cubic_bezier_unittest.cc',
-        'geometry/insets_unittest.cc',
-        'geometry/matrix3_unittest.cc',
-        'geometry/point_unittest.cc',
-        'geometry/point3_unittest.cc',
-        'geometry/quad_unittest.cc',
-        'geometry/r_tree_unittest.cc',
-        'geometry/rect_unittest.cc',
-        'geometry/safe_integer_conversions_unittest.cc',
-        'geometry/size_unittest.cc',
-        'geometry/vector2d_unittest.cc',
-        'geometry/vector3d_unittest.cc',
-        'image/image_mac_unittest.mm',
-        'image/image_util_unittest.cc',
-        'range/range_mac_unittest.mm',
-        'range/range_unittest.cc',
-        'range/range_win_unittest.cc',
-        'sequential_id_generator_unittest.cc',
-        'shadow_value_unittest.cc',
-        'skbitmap_operations_unittest.cc',
-        'skrect_conversion_unittest.cc',
-        'transform_util_unittest.cc',
-        'utf16_indexing_unittest.cc',
-      ],
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../../base/base.gyp:run_all_unittests',
-        '../../base/base.gyp:test_support_base',
-        '../../skia/skia.gyp:skia',
-        '../../testing/gtest.gyp:gtest',
-        '../../third_party/libpng/libpng.gyp:libpng',
-        'gfx',
-        'gfx_geometry',
-        'gfx_test_support',
-      ],
-      'conditions': [
-        ['OS == "ios"', {
-          'sources': ['<@(_common_sources)'],
-        }, {  # OS != "ios"
-          'sources': ['<@(_all_sources)'],
-        }],
-        ['OS == "win"', {
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [ 4267, ],
-        }],
-        ['OS != "mac" and OS != "ios"', {
-          'sources': [
-            'transform_unittest.cc',
-            'interpolated_transform_unittest.cc',
-          ],
-        }],
-        ['OS == "android"', {
-          'sources': [
-            'android/scroller_unittest.cc',
-          ],
-        }],
-        ['OS == "android" and gtest_target_type == "shared_library"', {
-          'dependencies': [
-            '../../testing/android/native_test.gyp:native_test_native_code',
-          ],
-        }],
-      ],
-    }
   ],
   'conditions': [
     ['OS=="android"' , {
@@ -548,20 +458,5 @@
        },
      ],
     }],
-    ['OS == "android"', {
-      'targets': [
-        {
-          'target_name': 'gfx_unittests_apk',
-          'type': 'none',
-          'dependencies': [
-            'gfx_unittests',
-          ],
-          'variables': {
-            'test_suite_name': 'gfx_unittests',
-          },
-          'includes': [ '../../build/apk_test.gypi' ],
-        },
-      ],
-    }],
   ],
 }