From f9bdcd1dbcdb327fd4d887dc60ac1257ffea6443 Mon Sep 17 00:00:00 2001 From: tfarina Date: Wed, 3 Sep 2014 07:45:46 -0700 Subject: [PATCH] Reland "ui: Move ui_unittests.gyp into ui/base." Original description from commit 63e36e6bdaa65d1152dd62f9831128c752bc0408: 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. It was reverted in commit 6297a2f1e441c46d6f8ca37a3798fe6fbdd6cc4c, because a test from ui_unittests in ios_dbg_simulator started to failing. BUG=331829,373148,299841,103304 TEST=ui_unittests R=sky@chromium.org,rohitrao@chromium.org Review URL: https://codereview.chromium.org/518423002 Cr-Original-Commit-Position: refs/heads/master@{#293134} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 2148b92f9cc676bf2b64dc7e47ef65daac393031 --- all.gyp | 20 ++++++++++---------- android/pylib/gtest/setup.py | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/all.gyp b/all.gyp index 6bb6a864f..d7fe5963a 100644 --- a/all.gyp +++ b/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', ], }, { @@ -862,8 +862,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', ], }, @@ -899,8 +899,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', ], }, @@ -947,8 +947,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', ], }, @@ -998,9 +998,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', ], @@ -1140,8 +1140,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', ], @@ -1184,6 +1184,7 @@ '../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:*', @@ -1191,7 +1192,6 @@ '../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', diff --git a/android/pylib/gtest/setup.py b/android/pylib/gtest/setup.py index da885c0ba..b278c0939 100644 --- a/android/pylib/gtest/setup.py +++ b/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/ui_unittests.isolate', + 'ui_unittests': 'ui/base/ui_base_tests.isolate', 'unit_tests': 'chrome/unit_tests.isolate', 'webkit_unit_tests': 'third_party/WebKit/Source/web/WebKitUnitTests.isolate',