Commit 8c62eafd authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Reland "[ios] Remove dependency of Showcase on //ios/chrome/app:app_internal"

This is a reland of 95ba7404

Original change's description:
> [ios] Remove dependency of Showcase on //ios/chrome/app:app_internal
> 
> Showcase should not depend on //ios/chrome/app (except for the hooks).
> The dependencies were unnecessary and can be safely removed (after the
> removal of one stale #include).
> 
> After this CL, there is no dependency on //ios/chrome/app:app_internal:
> 
>   $ gn path out/Debug-iphonesimulator --all \
>       //ios/showcase:ios_showcase_egtests \
>       //ios/chrome/app:app_internal
>   No non-data paths found between these two targets.
> 
> Bug: 870935
> Change-Id: I586fe8da7ce2e74dae2cedfd9720044afa97650f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2067264
> Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
> Commit-Queue: edchin <edchin@chromium.org>
> Reviewed-by: edchin <edchin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#744923}

Bug: 870935
Change-Id: I720f8e8dd8ed43ed2417d566454e8612cd518e43
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2082914Reviewed-by: default avataredchin <edchin@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746301}
parent cf2eeaaa
...@@ -492,8 +492,6 @@ source_set("eg_test_support+eg2") { ...@@ -492,8 +492,6 @@ source_set("eg_test_support+eg2") {
"chrome_earl_grey_app_interface.h", "chrome_earl_grey_app_interface.h",
"chrome_earl_grey_ui.h", "chrome_earl_grey_ui.h",
"chrome_earl_grey_ui.mm", "chrome_earl_grey_ui.mm",
"chrome_egtest_bundle_main.h",
"chrome_egtest_bundle_main.mm",
"chrome_matchers.h", "chrome_matchers.h",
"chrome_matchers.mm", "chrome_matchers.mm",
"chrome_matchers_app_interface.h", "chrome_matchers_app_interface.h",
...@@ -507,6 +505,8 @@ source_set("eg_test_support+eg2") { ...@@ -507,6 +505,8 @@ source_set("eg_test_support+eg2") {
"scoped_block_popups_pref.mm", "scoped_block_popups_pref.mm",
] ]
public_deps = [ ":chrome_egtest_bundle_main+eg2" ]
deps = [ deps = [
"//base", "//base",
"//base/test:test_support", "//base/test:test_support",
...@@ -533,3 +533,22 @@ source_set("eg_test_support+eg2") { ...@@ -533,3 +533,22 @@ source_set("eg_test_support+eg2") {
"//url", "//url",
] ]
} }
source_set("chrome_egtest_bundle_main+eg2") {
defines = [ "CHROME_EARL_GREY_2" ]
configs += [
"//build/config/compiler:enable_arc",
"//build/config/ios:xctest_config",
]
testonly = true
sources = [
"chrome_egtest_bundle_main.h",
"chrome_egtest_bundle_main.mm",
]
deps = [
"//base",
"//ui/base",
]
}
...@@ -41,7 +41,6 @@ source_set("eg2_tests") { ...@@ -41,7 +41,6 @@ source_set("eg2_tests") {
":badges_constants", ":badges_constants",
"//ios/chrome/browser/infobars:badge_public", "//ios/chrome/browser/infobars:badge_public",
"//ios/chrome/browser/ui/badges:public", "//ios/chrome/browser/ui/badges:public",
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
"//ios/showcase/test:eg2_test", "//ios/showcase/test:eg2_test",
"//ios/testing/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2",
"//ios/third_party/earl_grey2:test_lib", "//ios/third_party/earl_grey2:test_lib",
...@@ -57,7 +56,6 @@ source_set("eg_tests") { ...@@ -57,7 +56,6 @@ source_set("eg_tests") {
":badges_constants", ":badges_constants",
"//ios/chrome/browser/infobars:badge", "//ios/chrome/browser/infobars:badge",
"//ios/chrome/browser/ui/badges:public", "//ios/chrome/browser/ui/badges:public",
"//ios/chrome/test/earl_grey:test_support",
"//ios/showcase/test", "//ios/showcase/test",
"//ios/testing/earl_grey:earl_grey_support", "//ios/testing/earl_grey:earl_grey_support",
] ]
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
// found in the LICENSE file. // found in the LICENSE file.
#import "ios/chrome/browser/ui/badges/badge_constants.h" #import "ios/chrome/browser/ui/badges/badge_constants.h"
#import "ios/chrome/test/earl_grey/chrome_matchers.h"
#import "ios/showcase/badges/sc_badge_constants.h" #import "ios/showcase/badges/sc_badge_constants.h"
#import "ios/showcase/test/showcase_eg_utils.h" #import "ios/showcase/test/showcase_eg_utils.h"
#import "ios/showcase/test/showcase_test_case.h" #import "ios/showcase/test/showcase_test_case.h"
......
...@@ -24,7 +24,6 @@ source_set("eg2_tests") { ...@@ -24,7 +24,6 @@ source_set("eg2_tests") {
testonly = true testonly = true
sources = [ "sc_bubble_egtest.mm" ] sources = [ "sc_bubble_egtest.mm" ]
deps = [ deps = [
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
"//ios/showcase/test:eg2_test", "//ios/showcase/test:eg2_test",
"//ios/testing/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2",
"//ios/third_party/earl_grey2:test_lib", "//ios/third_party/earl_grey2:test_lib",
...@@ -38,7 +37,6 @@ source_set("eg_tests") { ...@@ -38,7 +37,6 @@ source_set("eg_tests") {
sources = [ "sc_bubble_egtest.mm" ] sources = [ "sc_bubble_egtest.mm" ]
deps = [ deps = [
"//ios/chrome/browser/ui/bubble", "//ios/chrome/browser/ui/bubble",
"//ios/chrome/test/earl_grey:test_support",
"//ios/showcase/test", "//ios/showcase/test",
"//ios/testing/earl_grey:earl_grey_support", "//ios/testing/earl_grey:earl_grey_support",
"//ios/third_party/earl_grey:earl_grey+link", "//ios/third_party/earl_grey:earl_grey+link",
......
...@@ -63,7 +63,6 @@ source_set("eg_tests") { ...@@ -63,7 +63,6 @@ source_set("eg_tests") {
"//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui",
"//ios/chrome/browser/ui/content_suggestions/cells:cells_ui", "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui",
"//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util",
"//ios/chrome/test/earl_grey:test_support",
"//ios/showcase/test", "//ios/showcase/test",
"//ios/testing/earl_grey:earl_grey_support", "//ios/testing/earl_grey:earl_grey_support",
"//ios/third_party/earl_grey:earl_grey+link", "//ios/third_party/earl_grey:earl_grey+link",
......
...@@ -82,7 +82,6 @@ source_set("eg2_tests") { ...@@ -82,7 +82,6 @@ source_set("eg2_tests") {
testonly = true testonly = true
sources = [ "showcase_egtest.mm" ] sources = [ "showcase_egtest.mm" ]
deps = [ deps = [
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
"//ios/showcase/test:eg2_test", "//ios/showcase/test:eg2_test",
"//ios/testing/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2",
"//ios/third_party/earl_grey2:test_lib", "//ios/third_party/earl_grey2:test_lib",
......
...@@ -71,7 +71,6 @@ source_set("eg_tests") { ...@@ -71,7 +71,6 @@ source_set("eg_tests") {
":constants", ":constants",
"//ios/chrome/browser/ui/infobars/banners:public", "//ios/chrome/browser/ui/infobars/banners:public",
"//ios/chrome/browser/ui/infobars/modals:public", "//ios/chrome/browser/ui/infobars/modals:public",
"//ios/chrome/test/earl_grey:test_support",
"//ios/showcase/infobars", "//ios/showcase/infobars",
"//ios/showcase/test", "//ios/showcase/test",
"//ios/testing/earl_grey:earl_grey_support", "//ios/testing/earl_grey:earl_grey_support",
......
...@@ -56,9 +56,11 @@ source_set("eg_test_support+eg2") { ...@@ -56,9 +56,11 @@ source_set("eg_test_support+eg2") {
deps = [ deps = [
"//base", "//base",
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
"//ios/third_party/earl_grey2:test_lib", "//ios/third_party/earl_grey2:test_lib",
"//ui/base", "//ui/base",
# This is required to load the resources for the EG2 tests.
"//ios/chrome/test/earl_grey:chrome_egtest_bundle_main+eg2",
] ]
} }
source_set("eg_app_support+eg2") { source_set("eg_app_support+eg2") {
......
...@@ -17,7 +17,6 @@ source_set("eg2_tests") { ...@@ -17,7 +17,6 @@ source_set("eg2_tests") {
testonly = true testonly = true
sources = [ "sc_text_badge_view_egtest.mm" ] sources = [ "sc_text_badge_view_egtest.mm" ]
deps = [ deps = [
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
"//ios/showcase/test:eg2_test", "//ios/showcase/test:eg2_test",
"//ios/testing/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2",
"//ios/third_party/earl_grey2:test_lib", "//ios/third_party/earl_grey2:test_lib",
...@@ -31,7 +30,6 @@ source_set("eg_tests") { ...@@ -31,7 +30,6 @@ source_set("eg_tests") {
sources = [ "sc_text_badge_view_egtest.mm" ] sources = [ "sc_text_badge_view_egtest.mm" ]
deps = [ deps = [
"//ios/chrome/browser/ui/reading_list:reading_list_ui", "//ios/chrome/browser/ui/reading_list:reading_list_ui",
"//ios/chrome/test/earl_grey:test_support",
"//ios/showcase/test", "//ios/showcase/test",
"//ios/testing/earl_grey:earl_grey_support", "//ios/testing/earl_grey:earl_grey_support",
"//ios/third_party/earl_grey:earl_grey+link", "//ios/third_party/earl_grey:earl_grey+link",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment