Revert of Start building ui_base_unittests targets. (patchset #1 id:1 of https://codereview.chromium.org/600833002/)

Reason for revert:
Breaks Android waterfall.
http://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20%28dbg%29

Original issue's description:
> Start building ui_base_unittests targets.
>
> This is in preparation for updating the buildbot code. First we need to
> make sure we build those targets, otherwise buildbot will fail.
>
> BUG=331829,373148,299841,103304
> TEST=None
> R=sky@chromium.org,maruel@chromium.org
>
> Committed: https://crrev.com/430fc906824927713d5a318afb50654e95b699b0
> Cr-Commit-Position: refs/heads/master@{#296877}

TBR=cjhopman@chromium.org,sky@chromium.org,maruel@chromium.org,tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=331829,373148,299841,103304

Review URL: https://codereview.chromium.org/603413002

Cr-Commit-Position: refs/heads/master@{#296903}

6 files changed, 1 insertions, 15 deletions

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index c33128b..46dabb9 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -1513,7 +1513,6 @@ def GetDefaultTryConfigs(bots=None):
           'url_unittests',
           'net_unittests',
           'sql_unittests',
-          'ui_base_unittests',
           'ui_unittests',
       ],
       'ios_rel_device': ['compile'],
diff --git a/ash/wm/ash_native_cursor_manager_unittest.cc b/ash/wm/ash_native_cursor_manager_unittest.cc
index 4b8bf52..66817f57 100644
--- a/ash/wm/ash_native_cursor_manager_unittest.cc
+++ b/ash/wm/ash_native_cursor_manager_unittest.cc
@@ -184,7 +184,7 @@ TEST_F(AshNativeCursorManagerTest, UIScaleShouldNotChangeCursor) {
 }
 
 #if defined(USE_X11)
-// This test is in ash_unittests becuase ui_base_unittests does not include
+// This test is in ash_unittests becuase ui_unittests does not include
 // 2x assets. crbug.com/372541.
 TEST_F(AshNativeCursorManagerTest, CursorLoaderX11Test) {
   const int kCursorId = 1;
diff --git a/build/all.gyp b/build/all.gyp
index 627ab11..4cafea2 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -55,7 +55,6 @@
             '../mojo/mojo_base.gyp:mojo_system_impl',
             '../mojo/mojo_base.gyp:mojo_system_unittests',
             '../google_apis/google_apis.gyp:google_apis_unittests',
-            '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/base/ui_base_tests.gyp:ui_unittests',
             '../ui/ios/ui_ios_tests.gyp:ui_ios_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
@@ -290,7 +289,6 @@
         '../net/net.gyp:net_unittests',
         '../sql/sql.gyp:sql_unittests',
         '../sync/sync.gyp:sync_unit_tests',
-        '../ui/base/ui_base_tests.gyp:ui_base_unittests',
         '../ui/base/ui_base_tests.gyp:ui_unittests',
         '../ui/display/display.gyp:display_unittests',
         '../ui/gfx/gfx_tests.gyp:gfx_unittests',
@@ -789,7 +787,6 @@
             '../tools/android/android_tools.gyp:android_tools',
             '../tools/android/android_tools.gyp:memconsumer',
             '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test',
-            '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/base/ui_base_tests.gyp:ui_unittests',
             '../ui/events/events.gyp:events_unittests',
             # Unit test bundles packaged as an apk.
@@ -817,7 +814,6 @@
             '../sql/sql.gyp:sql_unittests_apk',
             '../sync/sync.gyp:sync_unit_tests_apk',
             '../tools/android/heap_profiler/heap_profiler.gyp:heap_profiler_unittests_apk',
-            '../ui/base/ui_base_tests.gyp:ui_base_unittests_apk',
             '../ui/base/ui_base_tests.gyp:ui_unittests_apk',
             '../ui/events/events.gyp:events_unittests_apk',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
@@ -884,7 +880,6 @@
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             '../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
             '../tools/telemetry/telemetry.gyp:*',
-            '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/base/ui_base_tests.gyp:ui_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
             '../url/url.gyp:url_unittests',
@@ -922,7 +917,6 @@
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             '../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
             '../tools/telemetry/telemetry.gyp:*',
-            '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/base/ui_base_tests.gyp:ui_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
             '../url/url.gyp:url_unittests',
@@ -971,7 +965,6 @@
             '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
-            '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/base/ui_base_tests.gyp:ui_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
             '../url/url.gyp:url_unittests',
@@ -1023,7 +1016,6 @@
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             '../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
             '../tools/telemetry/telemetry.gyp:*',
-            '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/base/ui_base_tests.gyp:ui_unittests',
             '../ui/events/events.gyp:events_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
@@ -1167,7 +1159,6 @@
                 '../sql/sql.gyp:sql_unittests',
                 '../sync/sync.gyp:sync_unit_tests',
                 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
-                '../ui/base/ui_base_tests.gyp:ui_base_unittests',
                 '../ui/base/ui_base_tests.gyp:ui_unittests',
                 '../ui/gfx/gfx_tests.gyp:gfx_unittests',
                 '../ui/views/views.gyp:views_unittests',
@@ -1212,7 +1203,6 @@
             '../remoting/remoting.gyp:remoting_unittests',
             '../ui/app_list/app_list.gyp:*',
             '../ui/aura/aura.gyp:*',
-            '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/base/ui_base_tests.gyp:ui_unittests',
             '../ui/compositor/compositor.gyp:*',
             '../ui/display/display.gyp:display_unittests',
diff --git a/build/android/pylib/gtest/gtest_config.py b/build/android/pylib/gtest/gtest_config.py
index 3b51a42..aeca27e 100644
--- a/build/android/pylib/gtest/gtest_config.py
+++ b/build/android/pylib/gtest/gtest_config.py
@@ -31,7 +31,6 @@ STABLE_TEST_SUITES = [
     'sandbox_linux_unittests',
     'sql_unittests',
     'sync_unit_tests',
-    'ui_base_unittests',
     'ui_unittests',
     'unit_tests',
     'webkit_unit_tests',
diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py
index 71c576a..2782859 100644
--- a/build/android/pylib/gtest/setup.py
+++ b/build/android/pylib/gtest/setup.py
@@ -40,7 +40,6 @@ _ISOLATE_FILE_PATHS = {
     'media_unittests': 'media/media_unittests.isolate',
     'net_unittests': 'net/net_unittests.isolate',
     'sql_unittests': 'sql/sql_unittests.isolate',
-    'ui_base_unittests': 'ui/base/ui_base_tests.isolate',
     'ui_unittests': 'ui/base/ui_base_tests.isolate',
     'unit_tests': 'chrome/unit_tests.isolate',
     'webkit_unit_tests':
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 9732db1..db9e88f 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -390,7 +390,6 @@
             '../content/content_shell_and_tests.gyp:content_shell',
             '../content/content_shell_and_tests.gyp:content_unittests',
             '../net/net.gyp:net_unittests',
-            '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/base/ui_base_tests.gyp:ui_unittests',
           ],
         },