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

ui/gfx/gfx.gyp

 # Copyright (c) 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 420 matching lines @@
           # to have sources that are built on iOS, the target should be changed
           # to be of type static_library on all platforms.
           'type': 'none',
           # The cocoa files don't apply to iOS.
           'sources/': [
             ['exclude', 'cocoa']
           ],
         }],
       ],
     },
+    {
+      '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"' , {
      'targets': [
        {
          'target_name': 'gfx_jni_headers',
          'type': 'none',
          'sources': [
            '../android/java/src/org/chromium/ui/gfx/BitmapHelper.java',
            '../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java',
            '../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java',
          ],
          'variables': {
            'jni_gen_package': 'ui/gfx',
            'jni_generator_ptr_type': 'long'
          },
          'includes': [ '../../build/jni_generator.gypi' ],
        },
      ],
     }],
+    # Special target to wrap a gtest_target_type==shared_library
+    # gfx_unittests into an android apk for execution.
+    # See base.gyp for TODO(jrg)s about this strategy.
+    ['OS == "android" and gtest_target_type == "shared_library"', {
+      'targets': [
+        {
+          'target_name': 'gfx_unittests_apk',
+          'type': 'none',
+          'dependencies': [
+            'gfx_unittests',
+          ],
+          'variables': {
+            'test_suite_name': 'gfx_unittests',
+          },
+          'includes': [ '../../build/apk_test.gypi' ],
+        },
+      ],
+    }],
   ],
 }