Move geometric types to a separate, more lightweight 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': [
     {
       'target_name': 'ui_test_support',
       'dependencies': [
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         'gfx/gfx.gyp:gfx',
+        'gfx/gfx.gyp:gfx_geometry',
       ],
       'sources': [
         'base/test/cocoa_test_event_utils.h',
         'base/test/cocoa_test_event_utils.mm',
         'base/test/ui_cocoa_test_helper.h',
         'base/test/ui_cocoa_test_helper.mm',
         'base/test/ui_controls.h',
         'base/test/ui_controls_aura.cc',
         'base/test/ui_controls_gtk.cc',
         'base/test/ui_controls_internal_win.cc',
@@ skipping 55 matching lines @@
         '../base/base.gyp:test_support_base',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libpng/libpng.gyp:libpng',
         '../url/url.gyp:url_lib',
         'base/strings/ui_strings.gyp:ui_strings',
         'events/events.gyp:events_base',
+        'gfx/gfx.gyp:gfx_geometry_unittests',
         'resources/ui_resources.gyp:ui_resources',
         'run_ui_unittests',
         'shell_dialogs/shell_dialogs.gyp:shell_dialogs',
         'ui.gyp:ui',
         'ui_test_support',
       ],
       # iOS uses a small subset of ui. common_sources are the only files that
       # are built on iOS.
       'common_sources' : [
         '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',
         'gfx/animation/animation_container_unittest.cc',
         'gfx/animation/animation_unittest.cc',
         'gfx/animation/multi_animation_unittest.cc',
         'gfx/animation/slide_animation_unittest.cc',
-        'gfx/box_unittest.cc',
         'gfx/codec/png_codec_unittest.cc',
         'gfx/color_utils_unittest.cc',
         'gfx/display_unittest.cc',
         'gfx/font_unittest.cc',
         'gfx/image/image_family_unittest.cc',
         'gfx/image/image_skia_unittest.cc',
         'gfx/image/image_unittest.cc',
         'gfx/image/image_unittest_util.cc',
         'gfx/image/image_unittest_util.h',
         'gfx/image/image_unittest_util_ios.mm',
         'gfx/image/image_unittest_util_mac.mm',
-        'gfx/insets_unittest.cc',
-        'gfx/matrix3_unittest.cc',
-        'gfx/point_unittest.cc',
-        'gfx/point3_unittest.cc',
-        'gfx/quad_unittest.cc',
         'gfx/range/range_mac_unittest.mm',
         'gfx/range/range_unittest.cc',
         'gfx/range/range_win_unittest.cc',
-        'gfx/rect_unittest.cc',
-        'gfx/safe_integer_conversions_unittest.cc',
         'gfx/screen_unittest.cc',
         'gfx/shadow_value_unittest.cc',
-        'gfx/size_unittest.cc',
         'gfx/skbitmap_operations_unittest.cc',
+        'gfx/skrect_conversion_unittest.cc',
         'gfx/text_elider_unittest.cc',
         'gfx/text_utils_unittest.cc',
-        'gfx/vector2d_unittest.cc',
-        'gfx/vector3d_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_event_utils_unittest.mm',
         'base/cocoa/controls/blue_label_button_unittest.mm',
@@ skipping 217 matching lines @@
           'variables': {
             'test_suite_name': 'ui_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ui_unittests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }