1 files changed, 8 insertions, 60 deletions

diff --git a/chromium/ios/web/web_state/ui/BUILD.gn b/chromium/ios/web/web_state/ui/BUILD.gn
index bb46f6b59a6..0b66a6af303 100644
--- a/chromium/ios/web/web_state/ui/BUILD.gn
+++ b/chromium/ios/web/web_state/ui/BUILD.gn
@@ -8,14 +8,12 @@ source_set("ui") {
   deps = [
     ":crw_context_menu_controller",
     ":crw_web_view_navigation_proxy",
-    ":crw_wk_script_message_router",
-    ":favicon_util",
-    ":web_view_js_utils",
     "//base",
     "//ios/net",
     "//ios/web:core",
     "//ios/web/browsing_data",
     "//ios/web/common",
+    "//ios/web/favicon",
     "//ios/web/find_in_page",
     "//ios/web/js_messaging",
     "//ios/web/navigation",
@@ -48,8 +46,6 @@ source_set("ui") {
   ]
 
   sources = [
-    "crw_js_injector.h",
-    "crw_js_injector.mm",
     "crw_swipe_recognizer_provider.h",
     "crw_touch_tracking_recognizer.h",
     "crw_touch_tracking_recognizer.mm",
@@ -57,32 +53,16 @@ source_set("ui") {
     "crw_web_controller.mm",
     "crw_web_controller_container_view.h",
     "crw_web_controller_container_view.mm",
+    "crw_web_request_controller.h",
+    "crw_web_request_controller.mm",
     "crw_web_view_proxy_impl.h",
     "crw_web_view_proxy_impl.mm",
     "crw_web_view_scroll_view_proxy.mm",
     "crw_wk_ui_handler.h",
     "crw_wk_ui_handler.mm",
     "crw_wk_ui_handler_delegate.h",
-    "wk_security_origin_util.h",
-    "wk_security_origin_util.mm",
-  ]
-
-  libs = [ "WebKit.framework" ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
-source_set("crw_wk_script_message_router") {
-  deps = [
-    "//base",
-    "//ios/web/navigation:core",
-    "//ios/web/navigation:wk_navigation_util",
-    "//net",
-  ]
-
-  sources = [
-    "crw_wk_script_message_router.h",
-    "crw_wk_script_message_router.mm",
+    "js_window_error_manager.h",
+    "js_window_error_manager.mm",
   ]
 
   libs = [ "WebKit.framework" ]
@@ -103,11 +83,12 @@ source_set("crw_web_view_navigation_proxy") {
 source_set("crw_context_menu_controller") {
   deps = [
     "//base",
+    "//ios/web/js_messaging",
     "//ios/web/public",
     "//ios/web/public/deprecated",
     "//ios/web/web_state:context_menu",
-    "//ios/web/web_state/ui:crw_wk_script_message_router",
     "//ios/web/web_state/ui:wk_web_view_configuration_provider",
+    "//ui/base",
   ]
 
   sources = [
@@ -122,12 +103,11 @@ source_set("crw_context_menu_controller") {
 
 source_set("wk_web_view_configuration_provider") {
   deps = [
-    ":crw_wk_script_message_router",
     "//base",
     "//ios/web/common",
+    "//ios/web/js_messaging",
     "//ios/web/public",
     "//ios/web/web_state/js",
-    "//ios/web/web_state/js:script_util",
     "//ios/web/webui",
   ]
 
@@ -141,35 +121,3 @@ source_set("wk_web_view_configuration_provider") {
 
   configs += [ "//build/config/compiler:enable_arc" ]
 }
-
-source_set("web_view_js_utils") {
-  deps = [
-    "//base",
-    "//ios/web/public",
-  ]
-
-  sources = [
-    "web_view_js_utils.h",
-    "web_view_js_utils.mm",
-  ]
-
-  libs = [ "WebKit.framework" ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
-source_set("favicon_util") {
-  deps = [
-    "//base",
-    "//ios/web/public",
-  ]
-
-  sources = [
-    "favicon_util.h",
-    "favicon_util.mm",
-  ]
-
-  libs = [ "WebKit.framework" ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-}