Start the process of renaming ui_unittests to ui_base_unittests.

ui/base/ui_base_tests.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': [
     {
-      # TODO(tfarina): Rename this target to ui_base_unittests.
-      # In order to do this we will need to keep this target, add a dummy
-      # ui_base_unittests target that just points to ui_unittests, change
-      # buildbot code to reference the new 'ui_base_unittests' target.
-      # After buildbot is updated, we can make the changes in Chromium and
-      # remove 'ui_unittests' target. crbug.com/331829
+      # TODO(tfarina): Remove this target after all traces of it are updated to
+      # point to ui_base_unittests. That means updating buildbot code and some
+      # references in chromium too. crbug.com/331829
       # GN version: //ui/base:unittests
       'target_name': 'ui_unittests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../../base/base.gyp:test_support_base',
-        '../../net/net.gyp:net',
-        '../../skia/skia.gyp:skia',
-        '../../testing/gmock.gyp:gmock',
-        '../../testing/gtest.gyp:gtest',
-        '../../third_party/icu/icu.gyp:icui18n',
-        '../../third_party/icu/icu.gyp:icuuc',
-        '../../url/url.gyp:url_lib',
-        '../events/events.gyp:events_base',
-        '../gfx/gfx.gyp:gfx_test_support',
-        '../resources/ui_resources.gyp:ui_resources',
-        '../resources/ui_resources.gyp:ui_test_pak',
-        '../strings/ui_strings.gyp:ui_strings',
-        'ui_base.gyp:ui_base',
-        'ui_base.gyp:ui_base_test_support',
-      ],
-      # iOS uses a small subset of ui. common_sources are the only files that
-      # are built on iOS.
-      'common_sources' : [
-        # Note: file list duplicated in GN build.
-        'layout_unittest.cc',
-        'l10n/l10n_util_mac_unittest.mm',
-        'l10n/l10n_util_unittest.cc',
-        'l10n/l10n_util_win_unittest.cc',
-        'l10n/time_format_unittest.cc',
-        'models/tree_node_iterator_unittest.cc',
-        'resource/data_pack_literal.cc',
-        'resource/data_pack_unittest.cc',
-        'resource/resource_bundle_unittest.cc',
-        'test/run_all_unittests.cc',
-      ],
-      'all_sources': [
-        # Note: file list duplicated in GN build.
-        '<@(_common_sources)',
-        'accelerators/accelerator_manager_unittest.cc',
-        'accelerators/menu_label_accelerator_util_linux_unittest.cc',
-        'clipboard/custom_data_helper_unittest.cc',
-        'cocoa/base_view_unittest.mm',
-        'cocoa/cocoa_base_utils_unittest.mm',
-        'cocoa/controls/blue_label_button_unittest.mm',
-        'cocoa/controls/hover_image_menu_button_unittest.mm',
-        'cocoa/controls/hyperlink_button_cell_unittest.mm',
-        'cocoa/focus_tracker_unittest.mm',
-        'cocoa/fullscreen_window_manager_unittest.mm',
-        'cocoa/hover_image_button_unittest.mm',
-        'cocoa/menu_controller_unittest.mm',
-        'cocoa/nsgraphics_context_additions_unittest.mm',
-        'cocoa/tracking_area_unittest.mm',
-        'dragdrop/os_exchange_data_provider_aurax11_unittest.cc',
-        'ime/candidate_window_unittest.cc',
-        'ime/chromeos/character_composer_unittest.cc',
-        'ime/composition_text_util_pango_unittest.cc',
-        'ime/input_method_base_unittest.cc',
-        'ime/input_method_chromeos_unittest.cc',
-        'ime/remote_input_method_win_unittest.cc',
-        'ime/win/imm32_manager_unittest.cc',
-        'ime/win/tsf_input_scope_unittest.cc',
-        'models/list_model_unittest.cc',
-        'models/list_selection_model_unittest.cc',
-        'models/tree_node_model_unittest.cc',
-        'test/data/resource.h',
-        'text/bytes_formatting_unittest.cc',
-        'view_prop_unittest.cc',
-        'webui/web_ui_util_unittest.cc',
-        'x/selection_requestor_unittest.cc',
-      ],
-      'include_dirs': [
-        '../..',
-      ],
-      'conditions': [
-        ['OS!="ios"', {
-          'sources' : ['<@(_all_sources)'],
-        }, {  # OS=="ios"
-          'sources' : [
-            '<@(_common_sources)',
-          ],
-          # The ResourceBundle unittest expects a locale.pak file to exist in
-          # the bundle for English-US. Copy it in from where it was generated
-          # by ui_resources.gyp:ui_test_pak.
-          'mac_bundle_resources': [
-            '<(PRODUCT_DIR)/ui/en.lproj/locale.pak',
-          ],
-          'actions': [
-            {
-              'action_name': 'copy_test_data',
-              'variables': {
-                'test_data_files': [
-                  'test/data',
-                ],
-                'test_data_prefix' : 'ui/base',
-              },
-              'includes': [ '../../build/copy_test_data_ios.gypi' ],
-            },
-          ],
-        }],
-        ['OS == "win"', {
-          'sources': [
-            'dragdrop/os_exchange_data_win_unittest.cc',
-            'win/hwnd_subclass_unittest.cc',
-            'win/open_file_name_win_unittest.cc',
-          ],
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'DelayLoadDLLs': [
-                'd2d1.dll',
-                'd3d10_1.dll',
-              ],
-              'AdditionalDependencies': [
-                'd2d1.lib',
-                'd3d10_1.lib',
-              ],
-            },
-          },
-          'link_settings': {
-            'libraries': [
-              '-limm32.lib',
-              '-loleacc.lib',
-            ],
-          },
-          # 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:pangocairo',
-          ],
-          'conditions': [
-            ['use_allocator!="none"', {
-               'dependencies': [
-                 '../../base/allocator/allocator.gyp:allocator',
-               ],
-            }],
-          ],
-        }],
-        ['use_x11==1', {
-          'dependencies': [
-            '../../build/linux/system.gyp:x11',
-            '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-            '../events/platform/x11/x11_events_platform.gyp:x11_events_platform',
-            '../gfx/x/gfx_x11.gyp:gfx_x11',
-          ],
-        }],
-        ['OS!="win" or use_aura==0', {
-          'sources!': [
-            'view_prop_unittest.cc',
-          ],
-        }],
-        ['use_x11==1 and use_aura==1',  {
-          'sources': [
-            'cursor/cursor_loader_x11_unittest.cc',
-          ],
-        }],
-        ['OS=="mac"',  {
-          'dependencies': [
-            '../../third_party/mozilla/mozilla.gyp:mozilla',
-            '../events/events.gyp:events_test_support',
-            'ui_base_tests_bundle',
-          ],
-          'conditions': [
-            ['component=="static_library"', {
-              # Needed for mozilla.gyp.
-              'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
-            }],
-          ],
-        }],
-        ['use_aura==1 or toolkit_views==1',  {
-          'sources': [
-            'dragdrop/os_exchange_data_unittest.cc',
-          ],
-          'dependencies': [
-            '../events/events.gyp:events',
-            '../events/events.gyp:events_base',
-            '../events/events.gyp:events_test_support',
-            '../events/platform/events_platform.gyp:events_platform',
-          ],
-        }],
-        ['chromeos==1', {
-          'dependencies': [
-            '../../chromeos/chromeos.gyp:chromeos',
-            '../aura/aura.gyp:aura_test_support',
-            '../chromeos/ui_chromeos.gyp:ui_chromeos',
-            '../events/events.gyp:gesture_detection',
-          ],
-          'sources': [
-            '../chromeos/touch_exploration_controller_unittest.cc'
-          ],
-          'sources!': [
-            'dragdrop/os_exchange_data_provider_aurax11_unittest.cc',
-            'x/selection_requestor_unittest.cc',
-          ],
-        }],
-        ['use_x11==0', {
-          'sources!': [
-            'ime/chromeos/character_composer_unittest.cc',
-            'ime/input_method_chromeos_unittest.cc',
-            'ime/composition_text_util_pango_unittest.cc',
-          ],
-        }],
-      ],
-      'target_conditions': [
-        ['OS == "ios"', {
-          'sources/': [
-            # Pull in specific Mac files for iOS (which have been filtered out
-            # by file name rules).
-            ['include', '^l10n/l10n_util_mac_unittest\\.mm$'],
-          ],
-        }],
-      ],
+      'includes': [ 'ui_base_tests.gypi' ],
+    },
+    {
+      # GN version: //ui/base:unittests
+      'target_name': 'ui_base_unittests',
+      # TODO(tfarina): When ui_unittests is removed, move the content of the
+      # gypi file back here.
+      'includes': [ 'ui_base_tests.gypi' ],
     },
   ],
   'conditions': [
     # Mac target to build a test Framework bundle to mock out resource loading.
     ['OS == "mac"', {
       'targets': [
         {
           'target_name': 'ui_base_tests_bundle',
           'type': 'shared_library',
           'dependencies': [
             '../resources/ui_resources.gyp:ui_test_pak',
           ],
           'includes': [ 'ui_base_tests_bundle.gypi' ],
         },
       ],
     }],
     ['OS == "android"', {
       'targets': [
         {
+          # TODO(tfarina): Remove this target after all traces of it are updated
+          # to point to ui_base_unittests_apk. crbug.com/331829
           'target_name': 'ui_unittests_apk',
           'type': 'none',
           'dependencies': [
             'ui_unittests',
           ],
           'variables': {
             'test_suite_name': 'ui_unittests',
           },
           'includes': [ '../../build/apk_test.gypi' ],
         },
+        {
+          'target_name': 'ui_base_unittests_apk',
+          'type': 'none',
+          'dependencies': [
+            'ui_base_unittests',
+          ],
+          'variables': {
+            'test_suite_name': 'ui_base_unittests',
+          },
+          'includes': [ '../../build/apk_test.gypi' ],
+        },
       ],
     }],
   ],
 }