ui/base: Remove ui_unittests target.

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 696 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("ui_unittests") {
+# GYP version: ui/base/ui_base_tests.gyp:ui_base_unittests
+test("ui_base_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 73 matching lines @@
     "//ui/events:events_base",
     "//ui/events:test_support",
     "//ui/gfx:test_support",
     "//ui/resources",
     "//ui/resources:ui_test_pak",
     "//ui/strings",
     "//url",
   ]
 
   if (is_ios) {
-    # TODO(GYP) lots of iOS-only steps for ui_unittests
+    # TODO(GYP) lots of iOS-only steps for ui_base_unittests
   }
 
   if (is_win) {
     sources += [
       "dragdrop/os_exchange_data_win_unittest.cc",
       "win/hwnd_subclass_unittest.cc",
       "win/open_file_name_win_unittest.cc",
     ]
 
     ldflags = [
@@ skipping 49 matching lines @@
   }
 
   if (is_mac) {
     sources -= [
       "dragdrop/os_exchange_data_provider_aurax11_unittest.cc",
       "x/selection_requestor_unittest.cc",
     ]
 
     deps += [
       "//third_party/mozilla",
-      #'ui_unittests_bundle',  TODO(GYP)
+      #'ui_base_tests_bundle',  TODO(GYP)
     ]
   }
 
   if (use_aura || toolkit_views) {
     sources += [
       "dragdrop/os_exchange_data_unittest.cc"
     ]
 
     deps += [
       "//ui/events",
       "//ui/events/platform",
     ]
   }
 
   if (is_chromeos) {
     sources -= [
       "dragdrop/os_exchange_data_provider_aurax11_unittest.cc",
       "x/selection_requestor_unittest.cc",
     ]
     deps += [
       "//chromeos",
     ]
   }
 }
 }
-# TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk).
+# TODO(GYP) Mac (ui_base_tests_bundle) and Android (ui_base_unittests_apk).