ui: Fix the test names for ui/aura and ui/base.

ui/base/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
@@ skipping 680 matching lines @@
       "../android/java/src/org/chromium/ui/base/TouchDevice.java",
       "../android/java/src/org/chromium/ui/base/ViewAndroid.java",
       "../android/java/src/org/chromium/ui/base/WindowAndroid.java",
     ]
     jni_package = "base"
   }
 }
 
 # TODO(GYP): Make this work on Android and reenable it.
 if (!is_android) {
+# 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
 # GYP version: ui/base/ui_base_tests.gyp:ui_unittests
-test("unittests") {
-  # 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
-  output_name = "ui_unittests"
+test("ui_unittests") {
   sources = [
     "l10n/l10n_util_mac_unittest.mm",
     "l10n/l10n_util_unittest.cc",
     "l10n/l10n_util_win_unittest.cc",
     "l10n/time_format_unittest.cc",
     "layout_unittest.cc",
     "models/tree_node_iterator_unittest.cc",
     "resource/data_pack_literal.cc",
     "resource/data_pack_unittest.cc",
     "resource/resource_bundle_unittest.cc",
@@ skipping 170 matching lines @@
     deps += [
       "//ui/aura:test_support",
       "//ui/events:gesture_detection",
       #'../chromeos/chromeos.gyp:chromeos',  TODO(GYP)
       #'chromeos/ui_chromeos.gyp:ui_chromeos',
     ]
   }
 }
 }
 # TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk).