summaryrefslogtreecommitdiff
path: root/chromium/ios/web
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ios/web')
-rw-r--r--chromium/ios/web/BUILD.gn45
-rw-r--r--chromium/ios/web/browsing_data/BUILD.gn3
-rw-r--r--chromium/ios/web/common/BUILD.gn48
-rw-r--r--chromium/ios/web/find_in_page/BUILD.gn3
-rw-r--r--chromium/ios/web/interstitials/BUILD.gn1
-rw-r--r--chromium/ios/web/navigation/BUILD.gn2
-rw-r--r--chromium/ios/web/net/BUILD.gn1
-rw-r--r--chromium/ios/web/net/cookies/BUILD.gn7
-rw-r--r--chromium/ios/web/public/BUILD.gn23
-rw-r--r--chromium/ios/web/public/app/BUILD.gn2
-rw-r--r--chromium/ios/web/public/find_in_page/BUILD.gn1
-rw-r--r--chromium/ios/web/public/test/BUILD.gn23
-rw-r--r--chromium/ios/web/public/test/fakes/BUILD.gn3
-rw-r--r--chromium/ios/web/shell/test/BUILD.gn89
-rw-r--r--chromium/ios/web/test/BUILD.gn2
-rw-r--r--chromium/ios/web/test/fakes/BUILD.gn3
-rw-r--r--chromium/ios/web/web_state/BUILD.gn2
-rw-r--r--chromium/ios/web/web_state/js/BUILD.gn3
-rw-r--r--chromium/ios/web/web_state/ui/BUILD.gn4
-rw-r--r--chromium/ios/web/webui/BUILD.gn2
20 files changed, 221 insertions, 46 deletions
diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn
index 3e5db15c675..5fd32e6c9d9 100644
--- a/chromium/ios/web/BUILD.gn
+++ b/chromium/ios/web/BUILD.gn
@@ -39,6 +39,7 @@ source_set("web") {
":resources",
":service_names",
"//base",
+ "//ios/web/common",
"//ios/web/download",
"//ios/web/interstitials",
"//ios/web/navigation",
@@ -60,14 +61,12 @@ source_set("web") {
"browser_url_rewriter_impl.h",
"browser_url_rewriter_impl.mm",
"crw_navigation_item_storage.mm",
- "features.mm",
"network_context_owner.cc",
"service_manager_connection_impl.cc",
"service_manager_connection_impl.h",
"service_manager_context.h",
"service_manager_context.mm",
"url_scheme_util.mm",
- "url_util.cc",
"web_browser_manifest.h",
"web_browser_manifest.mm",
"web_client.mm",
@@ -105,6 +104,7 @@ source_set("core") {
}
source_set("earl_grey_test_support") {
+ defines = [ "CHROME_EARL_GREY_1" ]
configs += [ "//build/config/compiler:enable_arc" ]
testonly = true
@@ -116,6 +116,33 @@ source_set("earl_grey_test_support") {
"//ios/third_party/earl_grey:earl_grey+link",
"//ios/web/interstitials",
"//ios/web/public/test",
+ "//ios/web/public/test:element_selector",
+ "//net",
+ ]
+
+ sources = [
+ "public/test/earl_grey/js_test_util.h",
+ "public/test/earl_grey/js_test_util.mm",
+ "public/test/earl_grey/web_view_actions.h",
+ "public/test/earl_grey/web_view_actions.mm",
+ "public/test/earl_grey/web_view_matchers.h",
+ "public/test/earl_grey/web_view_matchers.mm",
+ ]
+}
+
+source_set("eg_app_support+eg2") {
+ defines = [ "CHROME_EARL_GREY_2" ]
+ configs += [ "//build/config/compiler:enable_arc" ]
+ testonly = true
+
+ deps = [
+ ":web",
+ "//base",
+ "//base/test:test_support",
+ "//ios/testing/earl_grey:eg_app_support+eg2",
+ "//ios/third_party/earl_grey2:app_framework+link",
+ "//ios/web/interstitials",
+ "//ios/web/public/test",
"//net",
]
@@ -175,6 +202,7 @@ test("ios_web_unittests") {
":ios_web_webui_unittests",
"//ios/testing:http_server_bundle_data",
"//ios/web/browsing_data:browsing_data_unittests",
+ "//ios/web/common:unittests",
"//ios/web/download:download_unittests",
"//ios/web/find_in_page:find_in_page_unittests",
"//ios/web/interstitials:interstitials_unittests",
@@ -216,7 +244,6 @@ source_set("ios_web_general_unittests") {
"service_manager_connection_impl_unittest.cc",
"test/web_test_unittest.mm",
"url_scheme_util_unittest.mm",
- "url_util_unittest.cc",
"web_client_unittest.mm",
"web_thread_unittest.cc",
]
@@ -233,6 +260,7 @@ source_set("ios_web_navigation_unittests") {
"//components/url_formatter",
"//ios/net",
"//ios/testing:ocmock_support",
+ "//ios/web/common",
"//ios/web/navigation",
"//ios/web/navigation:core",
"//ios/web/navigation:navigation_manager_util",
@@ -283,6 +311,7 @@ source_set("ios_web_net_unittests") {
"//ios/net",
"//ios/net:test_support",
"//ios/testing:ocmock_support",
+ "//ios/web/common",
"//ios/web/navigation",
"//ios/web/net/cookies",
"//ios/web/public",
@@ -304,6 +333,7 @@ source_set("ios_web_net_unittests") {
sources = [
"net/cert_host_pair_unittest.cc",
"net/cert_policy_unittest.cc",
+ "net/cookies/crw_wk_http_cookie_store_unittest.mm",
"net/cookies/system_cookie_store_util_unittest.mm",
"net/cookies/wk_cookie_util_unittest.mm",
"net/cookies/wk_http_system_cookie_store_unittest.mm",
@@ -359,7 +389,6 @@ source_set("ios_web_public_unittests") {
sources = [
"public/crw_session_certificate_policy_cache_storage_unittest.mm",
"public/origin_util_unittest.mm",
- "public/referrer_util_unittest.cc",
"public/serializable_user_data_manager_unittest.mm",
"public/ssl_status_unittest.cc",
"public/user_agent_unittest.mm",
@@ -380,6 +409,7 @@ source_set("ios_web_web_state_unittests") {
"//ios/net",
"//ios/testing:ocmock_support",
"//ios/web",
+ "//ios/web/common",
"//ios/web/find_in_page",
"//ios/web/interstitials",
"//ios/web/navigation",
@@ -464,7 +494,6 @@ source_set("ios_web_web_state_js_unittests") {
"web_state/js/common_js_unittest.mm",
"web_state/js/context_menu_js_unittest.mm",
"web_state/js/crw_js_injection_manager_unittest.mm",
- "web_state/js/crw_js_post_request_loader_unittest.mm",
"web_state/js/crw_js_window_id_manager_unittest.mm",
"web_state/js/find_in_page_js_unittest.mm",
"web_state/js/message_js_unittest.mm",
@@ -483,6 +512,7 @@ source_set("ios_web_web_state_ui_unittests") {
"//components/url_formatter",
"//ios/net",
"//ios/testing:ocmock_support",
+ "//ios/web/common",
"//ios/web/navigation",
"//ios/web/navigation:core",
"//ios/web/public",
@@ -570,11 +600,13 @@ test("ios_web_inttests") {
"//ios/testing:embedded_test_server_support",
"//ios/testing:http_server_bundle_data",
"//ios/web:resources_grit",
+ "//ios/web/common",
"//ios/web/download:download_inttests",
"//ios/web/navigation:core",
"//ios/web/navigation:wk_navigation_util",
"//ios/web/public/find_in_page",
"//ios/web/public/test",
+ "//ios/web/public/test:element_selector",
"//ios/web/public/test/fakes",
"//ios/web/public/test/http_server",
"//ios/web/test:mojo_bindings",
@@ -590,6 +622,7 @@ test("ios_web_inttests") {
"//services/service_manager/public/cpp",
"//testing/gtest",
"//ui/base:test_support",
+ "//ui/resources",
]
sources = [
"browser_state_web_view_partition_inttest.mm",
@@ -605,6 +638,7 @@ test("ios_web_inttests") {
"web_state/error_page_inttest.mm",
"web_state/favicon_callbacks_inttest.mm",
"web_state/http_auth_inttest.mm",
+ "web_state/keep_render_process_alive_inttest.mm",
"web_state/web_frame_impl_inttest.mm",
"web_state/web_frame_web_state_observer_inttest.mm",
"web_state/web_frames_manager_inttest.mm",
@@ -686,7 +720,6 @@ js_compile_checked("js_resources") {
]
sources = [
- "web_state/js/resources/post_request.js",
"web_state/js/resources/window_id.js",
]
}
diff --git a/chromium/ios/web/browsing_data/BUILD.gn b/chromium/ios/web/browsing_data/BUILD.gn
index b187e9eabdb..1e90f4d6f64 100644
--- a/chromium/ios/web/browsing_data/BUILD.gn
+++ b/chromium/ios/web/browsing_data/BUILD.gn
@@ -11,7 +11,9 @@ source_set("browsing_data") {
]
deps = [
+ "//base",
"//ios/web/public",
+ "//ios/web/web_state/ui:wk_web_view_configuration_provider",
]
configs += [ "//build/config/compiler:enable_arc" ]
@@ -22,6 +24,7 @@ source_set("browsing_data_unittests") {
testonly = true
deps = [
":browsing_data",
+ "//base/test:test_support",
"//ios/web/public/test/fakes",
"//testing/gtest",
]
diff --git a/chromium/ios/web/common/BUILD.gn b/chromium/ios/web/common/BUILD.gn
new file mode 100644
index 00000000000..536f97b0c90
--- /dev/null
+++ b/chromium/ios/web/common/BUILD.gn
@@ -0,0 +1,48 @@
+# Copyright 2019 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("//ios/build/config.gni")
+
+source_set("common") {
+ sources = [
+ "crw_content_view.h",
+ "crw_web_view_content_view.h",
+ "crw_web_view_content_view.mm",
+ "features.h",
+ "features.mm",
+ "referrer_util.cc",
+ "referrer_util.h",
+ "url_util.cc",
+ "url_util.h",
+ ]
+
+ deps = [
+ "//base",
+ "//ios/web/public:referrer",
+ "//net",
+ "//url",
+ ]
+
+ libs = [ "UIKit.framework" ]
+
+ configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("unittests") {
+ configs += [ "//build/config/compiler:enable_arc" ]
+ testonly = true
+ deps = [
+ ":common",
+ "//base",
+ "//ios/web/public:referrer",
+ "//net",
+ "//testing/gtest",
+ "//url",
+ ]
+
+ sources = [
+ "referrer_util_unittest.cc",
+ "url_util_unittest.cc",
+ ]
+}
diff --git a/chromium/ios/web/find_in_page/BUILD.gn b/chromium/ios/web/find_in_page/BUILD.gn
index a0721c2c1d1..caa3e3a3afe 100644
--- a/chromium/ios/web/find_in_page/BUILD.gn
+++ b/chromium/ios/web/find_in_page/BUILD.gn
@@ -14,6 +14,7 @@ source_set("find_in_page") {
sources = [
"find_in_page_constants.h",
"find_in_page_constants.mm",
+ "find_in_page_manager_delegate_bridge.mm",
"find_in_page_manager_impl.h",
"find_in_page_manager_impl.mm",
]
@@ -28,12 +29,14 @@ source_set("find_in_page_unittests") {
"//base",
"//base/test:test_support",
"//ios/web/public",
+ "//ios/web/public/find_in_page",
"//ios/web/public/test",
"//ios/web/public/test/fakes",
"//testing/gtest",
]
sources = [
+ "find_in_page_manager_delegate_bridge_unittest.mm",
"find_in_page_manger_impl_unittest.mm",
]
diff --git a/chromium/ios/web/interstitials/BUILD.gn b/chromium/ios/web/interstitials/BUILD.gn
index 2e38042f203..684ad44a65f 100644
--- a/chromium/ios/web/interstitials/BUILD.gn
+++ b/chromium/ios/web/interstitials/BUILD.gn
@@ -7,6 +7,7 @@ import("//ios/build/config.gni")
source_set("interstitials") {
deps = [
"//base",
+ "//ios/web/common",
"//ios/web/navigation:core",
"//ios/web/public",
"//ios/web/web_state:web_state_impl_header",
diff --git a/chromium/ios/web/navigation/BUILD.gn b/chromium/ios/web/navigation/BUILD.gn
index 9caf1738c18..571b67eacf2 100644
--- a/chromium/ios/web/navigation/BUILD.gn
+++ b/chromium/ios/web/navigation/BUILD.gn
@@ -9,6 +9,7 @@ source_set("navigation") {
":core",
"//base",
"//ios/web:core",
+ "//ios/web/common",
"//ios/web/navigation:wk_navigation_util",
"//ios/web/public",
"//ios/web/web_state:session_certificate_policy_cache",
@@ -70,6 +71,7 @@ source_set("core") {
source_set("wk_navigation_util") {
deps = [
"//base",
+ "//ios/web/common",
"//ios/web/public",
"//url",
]
diff --git a/chromium/ios/web/net/BUILD.gn b/chromium/ios/web/net/BUILD.gn
index 825526a6e0e..a5c74b691aa 100644
--- a/chromium/ios/web/net/BUILD.gn
+++ b/chromium/ios/web/net/BUILD.gn
@@ -9,6 +9,7 @@ source_set("net") {
"//base",
"//ios/net",
"//ios/web:core",
+ "//ios/web/common",
"//ios/web/navigation:core",
"//ios/web/navigation:navigation_manager_util",
"//ios/web/navigation:wk_navigation_util",
diff --git a/chromium/ios/web/net/cookies/BUILD.gn b/chromium/ios/web/net/cookies/BUILD.gn
index 4c2d484fd54..33c391ad491 100644
--- a/chromium/ios/web/net/cookies/BUILD.gn
+++ b/chromium/ios/web/net/cookies/BUILD.gn
@@ -6,13 +6,16 @@ import("//ios/build/config.gni")
source_set("cookies") {
deps = [
- "//base:base",
+ "//base",
"//ios/net",
- "//ios/web/public:public",
+ "//ios/web/common",
+ "//ios/web/public",
"//ios/web/web_state/ui:wk_web_view_configuration_provider",
]
sources = [
+ "crw_wk_http_cookie_store.h",
+ "crw_wk_http_cookie_store.mm",
"system_cookie_store_util.mm",
"wk_cookie_util.h",
"wk_cookie_util.mm",
diff --git a/chromium/ios/web/public/BUILD.gn b/chromium/ios/web/public/BUILD.gn
index 1c60fae3154..1b894afe16b 100644
--- a/chromium/ios/web/public/BUILD.gn
+++ b/chromium/ios/web/public/BUILD.gn
@@ -6,6 +6,7 @@ import("//ios/build/config.gni")
source_set("public") {
public_deps = [
+ ":referrer",
":user_agent",
"//net",
"//services/network/public/cpp",
@@ -13,12 +14,12 @@ source_set("public") {
]
deps = [
+ "//ios/web/common",
"//services/service_manager/public/cpp",
"//ui/base",
]
sources = [
- "block_types.h",
"browser_state.h",
"browser_url_rewriter.h",
"browsing_data_removing_util.h",
@@ -33,7 +34,6 @@ source_set("public") {
"favicon_status.h",
"favicon_url.cc",
"favicon_url.h",
- "features.h",
"interstitials/web_interstitial.h",
"interstitials/web_interstitial_delegate.h",
"java_script_dialog_callback.h",
@@ -45,9 +45,6 @@ source_set("public") {
"navigation_manager.h",
"origin_util.h",
"origin_util.mm",
- "referrer.h",
- "referrer_util.cc",
- "referrer_util.h",
"reload_type.h",
"security_style.h",
"serializable_user_data_manager.h",
@@ -59,7 +56,6 @@ source_set("public") {
"url_scheme_util.h",
"url_schemes.h",
"url_schemes.mm",
- "url_util.h",
"web_client.h",
"web_state/context_menu_params.h",
"web_state/global_web_state_observer.h",
@@ -70,11 +66,9 @@ source_set("public") {
"web_state/page_display_state.h",
"web_state/page_display_state.mm",
"web_state/session_certificate_policy_cache.h",
- "web_state/ui/crw_content_view.h",
"web_state/ui/crw_context_menu_delegate.h",
"web_state/ui/crw_native_content.h",
"web_state/ui/crw_native_content_provider.h",
- "web_state/ui/crw_web_view_content_view.h",
"web_state/ui/crw_web_view_proxy.h",
"web_state/ui/crw_web_view_scroll_view_proxy.h",
"web_state/url_verification_constants.h",
@@ -124,3 +118,16 @@ source_set("user_agent") {
configs += [ "//build/config/compiler:enable_arc" ]
}
+
+source_set("referrer") {
+ deps = [
+ "//base",
+ "//url",
+ ]
+
+ sources = [
+ "referrer.h",
+ ]
+
+ configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/web/public/app/BUILD.gn b/chromium/ios/web/public/app/BUILD.gn
index 059e3f64b57..ea886b39af9 100644
--- a/chromium/ios/web/public/app/BUILD.gn
+++ b/chromium/ios/web/public/app/BUILD.gn
@@ -4,7 +4,7 @@
source_set("app") {
sources = [
- "task_scheduler_init_params_callback.h",
+ "thread_pool_init_params_callback.h",
"web_main.h",
"web_main_delegate.h",
"web_main_parts.h",
diff --git a/chromium/ios/web/public/find_in_page/BUILD.gn b/chromium/ios/web/public/find_in_page/BUILD.gn
index 0cf31df4c7c..86d60f796bc 100644
--- a/chromium/ios/web/public/find_in_page/BUILD.gn
+++ b/chromium/ios/web/public/find_in_page/BUILD.gn
@@ -11,6 +11,7 @@ source_set("find_in_page") {
sources = [
"find_in_page_manager.h",
"find_in_page_manager_delegate.h",
+ "find_in_page_manager_delegate_bridge.h",
]
configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/web/public/test/BUILD.gn b/chromium/ios/web/public/test/BUILD.gn
index 8a0ff4427a2..e5d54f0427f 100644
--- a/chromium/ios/web/public/test/BUILD.gn
+++ b/chromium/ios/web/public/test/BUILD.gn
@@ -41,11 +41,26 @@ source_set("test") {
]
}
+source_set("element_selector") {
+ configs += [ "//build/config/compiler:enable_arc" ]
+ testonly = true
+
+ sources = [
+ "element_selector.h",
+ "element_selector.mm",
+ ]
+
+ deps = [
+ "//base",
+ ]
+}
+
source_set("util") {
configs += [ "//build/config/compiler:enable_arc" ]
testonly = true
deps = [
+ ":element_selector",
"//base",
"//base/test:test_support",
"//ios/web/public:public",
@@ -56,9 +71,13 @@ source_set("util") {
"//testing/gtest",
]
+ # TODO(crbug.com/922813): Remove this once internal targets depend directly
+ # on ":element_selector".
+ public_deps = [
+ "//ios/web/public/test:element_selector",
+ ]
+
sources = [
- "element_selector.h",
- "element_selector.mm",
"error_test_util.h",
"error_test_util.mm",
"js_test_util.h",
diff --git a/chromium/ios/web/public/test/fakes/BUILD.gn b/chromium/ios/web/public/test/fakes/BUILD.gn
index 0bb0e8315e3..99083ecaded 100644
--- a/chromium/ios/web/public/test/fakes/BUILD.gn
+++ b/chromium/ios/web/public/test/fakes/BUILD.gn
@@ -8,6 +8,7 @@ source_set("fakes") {
deps = [
"//base",
+ "//ios/web/common",
"//ios/web/public/download",
"//ios/web/public/find_in_page",
"//ios/web/test:test_constants",
@@ -26,6 +27,8 @@ source_set("fakes") {
]
sources = [
+ "crw_fake_find_in_page_manager_delegate.h",
+ "crw_fake_find_in_page_manager_delegate.mm",
"crw_fake_web_state_policy_decider.h",
"crw_fake_web_state_policy_decider.mm",
"crw_test_js_injection_receiver.h",
diff --git a/chromium/ios/web/shell/test/BUILD.gn b/chromium/ios/web/shell/test/BUILD.gn
index a52d68dc48c..c39e89880c8 100644
--- a/chromium/ios/web/shell/test/BUILD.gn
+++ b/chromium/ios/web/shell/test/BUILD.gn
@@ -16,6 +16,7 @@ group("all_tests") {
}
ios_eg_test("ios_web_shell_egtests") {
+ defines = [ "CHROME_EARL_GREY_1" ]
info_plist = "//ios/web/shell/Info.plist"
sources = [
"context_menu_egtest.mm",
@@ -27,23 +28,22 @@ ios_eg_test("ios_web_shell_egtests") {
":earl_grey_test_support",
"//base",
"//base/test:test_support",
+ "//ios/testing:http_server_bundle_data",
"//ios/testing/earl_grey:earl_grey_support",
"//ios/web",
"//ios/web:earl_grey_test_support",
"//ios/web/public/test",
+ "//ios/web/public/test:element_selector",
"//ios/web/public/test/fakes",
- "//ios/web/public/test/http_server",
"//ios/web/shell",
"//ios/web/shell:shell_interfaces",
- "//net",
+ "//net:test_support",
"//services/service_manager/public/cpp",
"//services/test/echo/public/mojom",
"//services/test/user_id/public/mojom",
"//url",
]
- bundle_deps = [ ":bundle" ]
-
configs += [ "//build/config/compiler:enable_arc" ]
assert_no_deps = ios_assert_no_deps
@@ -61,7 +61,7 @@ source_set("earl_grey_test_support") {
"//ios/web",
"//ios/web:earl_grey_test_support",
"//ios/web/public/test",
- "//ios/web/public/test/http_server",
+ "//ios/web/public/test:element_selector",
"//ios/web/shell",
"//testing/gtest:gtest",
"//url",
@@ -80,12 +80,16 @@ source_set("earl_grey_test_support") {
"app/web_view_interaction_test_util.mm",
"earl_grey/shell_actions.h",
"earl_grey/shell_actions.mm",
+ "earl_grey/shell_actions_app_interface.h",
+ "earl_grey/shell_actions_app_interface.mm",
"earl_grey/shell_earl_grey.h",
"earl_grey/shell_earl_grey.mm",
+ "earl_grey/shell_earl_grey_app_interface.h",
+ "earl_grey/shell_earl_grey_app_interface.mm",
"earl_grey/shell_matchers.h",
"earl_grey/shell_matchers.mm",
- "earl_grey/shell_matchers_shorthand.h",
- "earl_grey/shell_matchers_shorthand.mm",
+ "earl_grey/shell_matchers_app_interface.h",
+ "earl_grey/shell_matchers_app_interface.mm",
"earl_grey/web_shell_test_case.h",
"earl_grey/web_shell_test_case.mm",
]
@@ -93,22 +97,44 @@ source_set("earl_grey_test_support") {
configs += [ "//build/config/compiler:enable_arc" ]
}
-bundle_data("bundle") {
- visibility = [ ":*" ]
- sources = [
- "http_server_files/tall_page.html",
- ]
- outputs = [
- "{{bundle_resources_dir}}/{{source_root_relative_dir}}/" +
- "{{source_file_part}}",
- ]
-}
-
################################
# EG2 targets.
-group("eg_app_support+eg2") {
+source_set("eg_app_support+eg2") {
+ defines = [ "CHROME_EARL_GREY_2" ]
+ configs += [
+ "//build/config/compiler:enable_arc",
+ "//build/config/ios:xctest_config",
+ ]
testonly = true
+
+ sources = [
+ "app/navigation_test_util.h",
+ "app/navigation_test_util.mm",
+ "app/web_shell_test_util.h",
+ "app/web_shell_test_util.mm",
+ "app/web_view_interaction_test_util.h",
+ "app/web_view_interaction_test_util.mm",
+ "earl_grey/shell_actions_app_interface.h",
+ "earl_grey/shell_actions_app_interface.mm",
+ "earl_grey/shell_earl_grey_app_interface.h",
+ "earl_grey/shell_earl_grey_app_interface.mm",
+ "earl_grey/shell_matchers_app_interface.h",
+ "earl_grey/shell_matchers_app_interface.mm",
+ ]
+
+ deps = [
+ "//base",
+ "//base/test:test_support",
+ "//ios/testing/earl_grey:eg_app_support+eg2",
+ "//ios/third_party/earl_grey2:app_framework+link",
+ "//ios/web",
+ "//ios/web:eg_app_support+eg2",
+ "//ios/web/public/test",
+ "//ios/web/public/test/http_server",
+ "//ios/web/shell",
+ "//url",
+ ]
}
source_set("eg_test_support+eg2") {
@@ -120,18 +146,31 @@ source_set("eg_test_support+eg2") {
testonly = true
sources = [
+ "earl_grey/shell_actions.h",
+ "earl_grey/shell_actions.mm",
+ "earl_grey/shell_actions_app_interface.h",
+ "earl_grey/shell_earl_grey.h",
+ "earl_grey/shell_earl_grey.mm",
+ "earl_grey/shell_earl_grey_app_interface.h",
+ "earl_grey/shell_matchers.h",
+ "earl_grey/shell_matchers.mm",
+ "earl_grey/shell_matchers_app_interface.h",
"earl_grey/web_shell_test_case.h",
"earl_grey/web_shell_test_case.mm",
]
deps = [
+ "//base",
+ "//base/test:test_support",
"//ios/testing/earl_grey:eg_test_support+eg2",
"//ios/third_party/earl_grey2:test_lib",
- "//ios/web/public/test/http_server",
+ "//ios/web/public/test:element_selector",
+ "//url",
]
}
source_set("eg_tests+eg2") {
+ defines = [ "CHROME_EARL_GREY_2" ]
configs += [
"//build/config/compiler:enable_arc",
"//build/config/ios:xctest_config",
@@ -139,12 +178,18 @@ source_set("eg_tests+eg2") {
testonly = true
sources = [
- "web_shell_sample_egtest.mm",
+ "context_menu_egtest.mm",
+ "page_state_egtest.mm",
]
deps = [
":eg_test_support+eg2",
+ "//base",
+ "//ios/testing/earl_grey:eg_test_support+eg2",
"//ios/third_party/earl_grey2:test_lib",
+ "//ios/web/public/test:element_selector",
+ "//ios/web/public/test/http_server",
+ "//net:test_support",
]
libs = [ "UIKit.framework" ]
@@ -170,5 +215,5 @@ ios_eg2_test("ios_web_shell_eg2tests") {
":eg_tests+eg2",
]
- bundle_deps = [ ":bundle" ]
+ bundle_deps = [ "//ios/testing:http_server_bundle_data" ]
}
diff --git a/chromium/ios/web/test/BUILD.gn b/chromium/ios/web/test/BUILD.gn
index 20a20ef4332..e4270f5f033 100644
--- a/chromium/ios/web/test/BUILD.gn
+++ b/chromium/ios/web/test/BUILD.gn
@@ -17,10 +17,12 @@ repack("packed_resources") {
sources = [
"$root_gen_dir/ios/web/ios_web_resources.pak",
"$root_gen_dir/ios/web/test/test_resources.pak",
+ "$root_gen_dir/ui/resources/webui_resources.pak",
]
deps = [
":resources",
"//ios/web:resources",
+ "//ui/resources",
]
output = "$target_gen_dir/resources.pak"
copy_data_to_bundle = true
diff --git a/chromium/ios/web/test/fakes/BUILD.gn b/chromium/ios/web/test/fakes/BUILD.gn
index 10bc6fdbda7..569ea755382 100644
--- a/chromium/ios/web/test/fakes/BUILD.gn
+++ b/chromium/ios/web/test/fakes/BUILD.gn
@@ -12,6 +12,7 @@ source_set("fakes") {
"//ios/web/navigation:core",
"//ios/web/public:public",
"//ios/web/web_state/ui:crw_web_view_navigation_proxy",
+ "//ios/web/web_state/ui:wk_web_view_configuration_provider",
"//testing/gmock",
"//third_party/ocmock:ocmock",
]
@@ -31,6 +32,8 @@ source_set("fakes") {
"crw_fake_wk_navigation_response.mm",
"fake_navigation_manager_delegate.h",
"fake_navigation_manager_delegate.mm",
+ "fake_wk_configuration_provider_observer.h",
+ "fake_wk_configuration_provider_observer.mm",
"mock_interstitial_delegate.h",
"mock_interstitial_delegate.mm",
]
diff --git a/chromium/ios/web/web_state/BUILD.gn b/chromium/ios/web/web_state/BUILD.gn
index 2ce39203262..ebfd098096e 100644
--- a/chromium/ios/web/web_state/BUILD.gn
+++ b/chromium/ios/web/web_state/BUILD.gn
@@ -12,6 +12,7 @@ source_set("web_state") {
":web_state_impl_header",
":wk_web_view_security_util",
"//base",
+ "//ios/web/common",
"//ios/web/interstitials",
"//ios/web/navigation",
"//ios/web/navigation:core",
@@ -152,6 +153,7 @@ source_set("context_menu") {
deps = [
"//base",
"//components/url_formatter",
+ "//ios/web/common",
"//ios/web/public",
]
diff --git a/chromium/ios/web/web_state/js/BUILD.gn b/chromium/ios/web/web_state/js/BUILD.gn
index de76bc5b850..28b6271f737 100644
--- a/chromium/ios/web/web_state/js/BUILD.gn
+++ b/chromium/ios/web/web_state/js/BUILD.gn
@@ -9,14 +9,11 @@ source_set("js") {
":script_util",
"//base",
"//ios/web/public",
- "//ios/web/web_state/ui:crw_wk_script_message_router",
]
sources = [
"crw_js_injection_manager.mm",
"crw_js_injection_receiver.mm",
- "crw_js_post_request_loader.h",
- "crw_js_post_request_loader.mm",
"crw_js_window_id_manager.h",
"crw_js_window_id_manager.mm",
]
diff --git a/chromium/ios/web/web_state/ui/BUILD.gn b/chromium/ios/web/web_state/ui/BUILD.gn
index 2657aa75850..14cb032f9f2 100644
--- a/chromium/ios/web/web_state/ui/BUILD.gn
+++ b/chromium/ios/web/web_state/ui/BUILD.gn
@@ -23,6 +23,7 @@ source_set("ui") {
"//ios/net",
"//ios/web:core",
"//ios/web/browsing_data",
+ "//ios/web/common",
"//ios/web/find_in_page",
"//ios/web/interstitials",
"//ios/web/navigation",
@@ -57,7 +58,6 @@ source_set("ui") {
"crw_web_controller.mm",
"crw_web_controller_container_view.h",
"crw_web_controller_container_view.mm",
- "crw_web_view_content_view.mm",
"crw_web_view_proxy_impl.h",
"crw_web_view_proxy_impl.mm",
"crw_web_view_scroll_view_proxy.mm",
@@ -131,6 +131,7 @@ source_set("wk_web_view_configuration_provider") {
deps = [
":crw_wk_script_message_router",
"//base",
+ "//ios/web/common",
"//ios/web/public",
"//ios/web/web_state/js",
"//ios/web/web_state/js:script_util",
@@ -140,6 +141,7 @@ source_set("wk_web_view_configuration_provider") {
sources = [
"wk_web_view_configuration_provider.h",
"wk_web_view_configuration_provider.mm",
+ "wk_web_view_configuration_provider_observer.h",
]
libs = [ "WebKit.framework" ]
diff --git a/chromium/ios/web/webui/BUILD.gn b/chromium/ios/web/webui/BUILD.gn
index 9947ca2c08f..6f7a42fc43b 100644
--- a/chromium/ios/web/webui/BUILD.gn
+++ b/chromium/ios/web/webui/BUILD.gn
@@ -38,8 +38,8 @@ source_set("webui") {
"url_data_source_ios_impl.h",
"url_fetcher_block_adapter.h",
"url_fetcher_block_adapter.mm",
- "web_ui_ios_controller_factory_registry.cc",
"web_ui_ios_controller_factory_registry.h",
+ "web_ui_ios_controller_factory_registry.mm",
"web_ui_ios_data_source_impl.h",
"web_ui_ios_data_source_impl.mm",
"web_ui_ios_impl.h",
View Lorry Controller Status