Start the process of renaming ui_unittests to ui_base_unittests.

ui/base/ui_base_tests.gyp

Index: ui/base/ui_base_tests.gyp
diff --git a/ui/base/ui_base_tests.gyp b/ui/base/ui_base_tests.gyp
index 945a9ec2d805f1b15140ba581135b0384b55a234..0db57be7a4767f11c7e2f146c9ce4629fd360c1c 100644
--- a/ui/base/ui_base_tests.gyp
+++ b/ui/base/ui_base_tests.gyp
@@ -8,14 +8,8 @@
   },
   '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',
@@ -233,6 +227,66 @@
         }],
       ],
     },
+    {
+      # 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"',
+          {
+            '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)',

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

It the only difference is in the variables, why not move the conditions in
there?

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

Done.

+                  '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)',
+                ],
+              },
+            ],
+          },
+        ],
+      ],
+    },
   ],
   'conditions': [
     # Mac target to build a test Framework bundle to mock out resource loading.
@@ -255,9 +309,10 @@
           'type': 'none',
           'dependencies': [
             'ui_unittests',
+            'ui_base_unittests',
           ],
           'variables': {
-            'test_suite_name': 'ui_unittests',
+            'test_suite_name': 'ui_base_unittests',
           },
           'includes': [ '../../build/apk_test.gypi' ],
         },