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
       # GN version: //ui/base:unittests
-      'target_name': 'ui_unittests',
+      'target_name': 'ui_base_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',
@@ skipping 197 matching lines @@
       '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$'],
           ],
         }],
       ],
     },
+    {
+      # 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
+      'target_name': 'ui_unittests',
+      'type': 'none',
+      'dependencies': [
+        'ui_base_unittests',
+      ],
+      'conditions': [
+        ['OS != "ios" and OS != "android"',
+          {
+            'actions': [
+              {
+                'message': 'TEMPORARY: Copying ui_base_unittests to ui_unittests',
+                'action_name': 'copy_ui_base_unittests',
+                'variables': {
+                  'source_file': '<(PRODUCT_DIR)/ui_base_unittests<(EXECUTABLE_SUFFIX)',
+                  'dest_file': '<(PRODUCT_DIR)/ui_unittests<(EXECUTABLE_SUFFIX)',
+                },
+                'inputs': [
+                  '../../build/cp.py',
+                  '<(source_file)',
+                ],
+                'outputs': [
+                  '<(dest_file)',
+                ],
+                'action': [
+                  'python', '../../build/cp.py', '<(source_file)', '<(dest_file)',
+                ],
+              },
+            ],
+          },
+        ],
+        ['OS == "ios"',
+          {
+            'actions': [
+              {
+                'message': 'TEMPORARY: Copying ui_base_unittests to ui_unittests',
+                'action_name': 'copy_ui_base_unittests',
+                'variables': {
+                  'source_file': '<(PRODUCT_DIR)/ui_base_unittests.app/ui_base_unittests',
+                  'dest_file': '<(PRODUCT_DIR)/ui_unittests.app/ui_unittests',
+                },
+                'inputs': [
+                  '../../build/cp.py',
+                  '<(source_file)',
+                ],
+                'outputs': [
+                  '<(dest_file)',
+                ],
+                'action': [
+                  'python', '../../build/cp.py', '<(source_file)', '<(dest_file)',
+                ],
+              },
+            ],
+          },

[cjhopman, 2014/09/22 00:07:41]

For android you probably have to copy
<(PRODUCT_DIR)/ui_base_unittests/ui_base_unittests-debug.apk
to
<(PRODUCT_DIR)/ui_unittests/ui_unittests-debug.apk

You can probably put that in the ui_unittest_apk target (or even better rename
that target to ui_base_unittests_apk and add a ui_unittests_apk for the copy
just like you've done here for other platforms.

[tfarina, 2014/09/22 00:53:15]

Done.

+        ],
+      ],
+    },
   ],
   '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': [
         {
           'target_name': 'ui_unittests_apk',
           'type': 'none',
           'dependencies': [
             'ui_unittests',

[cjhopman, 2014/09/22 00:07:41]

remove ui_unittests

[tfarina, 2014/09/22 00:53:15]

Done.

+            'ui_base_unittests',
           ],
           'variables': {
-            'test_suite_name': 'ui_unittests',
+            'test_suite_name': 'ui_base_unittests',
           },
           'includes': [ '../../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }