Revert of ui: Move ui_unittests.gyp into ui/base. (patchset #5 id:80001 of...

Revert of ui: Move ui_unittests.gyp into ui/base. (patchset #5 id:80001 of https://codereview.chromium.org/506483002/)

Reason for revert:
it breaks clobber build of ios_dbg_simulator.

Original issue's description:
> ui: Move ui_unittests.gyp into ui/base.
>
> ui_unittests.gyp -> ui_base_tests.gyp (follow gfx_tests.gyp pattern).
> ui_unittests_bundle.gypi -> ui/base/ui_base_tests_bundle.gypi
> ui_unittests.isolate -> ui_base_tests.isolate
>
> Add a TODO assigned to me to rename ui_unittests target to
> ui_base_unittests when buildbot is updated.
>
> BUG=331829,373148,299841,103304
> TEST=ui_unittests
> R=sky@chromium.org
>
> Committed: https://chromium.googlesource.com/chromium/src/+/60f6892f7223f9d6db92314edb5df9b63d25720f

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

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

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

build/all.gyp

@@ -39,8 +39,8 @@
         ['OS=="ios"', {
           'dependencies': [
             '../ios/ios.gyp:*',
-            '../ui/base/ui_base_tests.gyp:ui_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
+            '../ui/ui_unittests.gyp:ui_unittests',
           ],
         }],
         ['OS=="android"', {
@@ -270,9 +270,9 @@
         '../net/net.gyp:net_unittests',
         '../sql/sql.gyp:sql_unittests',
         '../sync/sync.gyp:sync_unit_tests',
-        '../ui/base/ui_base_tests.gyp:ui_unittests',
         '../ui/display/display.gyp:display_unittests',
         '../ui/gfx/gfx_tests.gyp:gfx_unittests',
+        '../ui/ui_unittests.gyp:ui_unittests',
         '../url/url.gyp:url_unittests',
       ],
       'conditions': [
@@ -770,8 +770,8 @@
             '../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_unittests',
             '../ui/events/events.gyp:events_unittests',
+            '../ui/ui_unittests.gyp:ui_unittests',
             # Unit test bundles packaged as an apk.
             '../android_webview/android_webview.gyp:android_webview_test_apk',
             '../android_webview/android_webview.gyp:android_webview_unittests_apk',
@@ -796,9 +796,9 @@
             '../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_unittests_apk',
             '../ui/events/events.gyp:events_unittests_apk',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
+            '../ui/ui_unittests.gyp:ui_unittests_apk',
           ],
         },
         {
@@ -880,8 +880,8 @@
             '../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_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
+            '../ui/ui_unittests.gyp:ui_unittests',
             '../url/url.gyp:url_unittests',
           ],
         },
@@ -917,8 +917,8 @@
             '../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_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
+            '../ui/ui_unittests.gyp:ui_unittests',
             '../url/url.gyp:url_unittests',
           ],
         },
@@ -965,8 +965,8 @@
             '../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_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
+            '../ui/ui_unittests.gyp:ui_unittests',
             '../url/url.gyp:url_unittests',
           ],
         },
@@ -1016,9 +1016,9 @@
             '../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_unittests',
             '../ui/events/events.gyp:events_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
+            '../ui/ui_unittests.gyp:ui_unittests',
             '../ui/views/views.gyp:views_unittests',
             '../url/url.gyp:url_unittests',
           ],
@@ -1158,8 +1158,8 @@
                 '../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_unittests',
                 '../ui/gfx/gfx_tests.gyp:gfx_unittests',
+                '../ui/ui_unittests.gyp:ui_unittests',
                 '../ui/views/views.gyp:views_unittests',
                 '../url/url.gyp:url_unittests',
               ],
@@ -1202,7 +1202,6 @@
             '../remoting/remoting.gyp:remoting_unittests',
             '../ui/app_list/app_list.gyp:*',
             '../ui/aura/aura.gyp:*',
-            '../ui/base/ui_base_tests.gyp:ui_unittests',
             '../ui/compositor/compositor.gyp:*',
             '../ui/display/display.gyp:display_unittests',
             '../ui/events/events.gyp:*',
@@ -1210,6 +1209,7 @@
             '../ui/keyboard/keyboard.gyp:*',
             '../ui/message_center/message_center.gyp:*',
             '../ui/snapshot/snapshot.gyp:snapshot_unittests',
+            '../ui/ui_unittests.gyp:ui_unittests',
             '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
             '../ui/views/views.gyp:views',
             '../ui/views/views.gyp:views_unittests',

build/android/pylib/gtest/setup.py

@@ -40,7 +40,7 @@ _ISOLATE_FILE_PATHS = {
     'media_unittests': 'media/media_unittests.isolate',
     'net_unittests': 'net/net_unittests.isolate',
     'sql_unittests': 'sql/sql_unittests.isolate',
-    'ui_unittests': 'ui/base/ui_base_tests.isolate',
+    'ui_unittests': 'ui/ui_unittests.isolate',
     'unit_tests': 'chrome/unit_tests.isolate',
     'webkit_unit_tests':
       'third_party/WebKit/Source/web/WebKitUnitTests.isolate',

chrome/chrome.gyp

@@ -443,7 +443,7 @@
             '../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_unittests',
+            '../ui/ui_unittests.gyp:ui_unittests',
           ],
         },
         {

ui/base/ui_base_tests.isolate → ui/ui_unittests.isolate

@@ -6,13 +6,13 @@
     ['OS=="android"', {
       'variables': {
         'isolate_dependency_tracked': [
-          'test/data/data_pack_unittest/truncated-header.pak',
+          'base/test/data/data_pack_unittest/truncated-header.pak',
           '<(PRODUCT_DIR)/locales/en-US.pak',
         ],
       },
     }],
   ],
   'includes': [
-    '../../third_party/icu/icu.isolate',
+    '../third_party/icu/icu.isolate',
   ],
 }

ui/base/ui_base_tests_bundle.gypi → ui/ui_unittests_bundle.gypi

@@ -20,15 +20,15 @@
     'DYLIB_INSTALL_NAME_BASE': '@executable_path/../Versions/1.0.0.0',
     'LD_DYLIB_INSTALL_NAME':
         '$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(WRAPPER_NAME)/$(PRODUCT_NAME)',
-    'INFOPLIST_FILE': 'test/framework-Info.plist',
+    'INFOPLIST_FILE': 'base/test/framework-Info.plist',
   },
   'mac_bundle_resources': [
-    'test/framework-Info.plist',
+    'base/test/framework-Info.plist',
     '<(PRODUCT_DIR)/ui_test.pak',
     '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
   ],
   'mac_bundle_resources!': [
-    'test/framework-Info.plist',
+    'base/test/framework-Info.plist',
   ],
   'postbuilds': [
     {