12 files changed, 41 insertions, 4 deletions
diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn
index d202ba7c4b9..b980395dbf7 100644
--- a/chromium/ios/web/BUILD.gn
+++ b/chromium/ios/web/BUILD.gn
@@ -45,6 +45,7 @@ source_set("web") {
     "//ios/web/favicon",
     "//ios/web/init",
     "//ios/web/navigation",
+    "//ios/web/navigation:wk_navigation_util",
     "//ios/web/net",
     "//ios/web/public",
     "//ios/web/public/security",
@@ -240,7 +241,7 @@ source_set("ios_web_general_unittests") {
   ]
 
   sources = [
-    "browser_state_unittest.cc",
+    "browser_state_unittest.mm",
     "crw_navigation_item_storage_unittest.mm",
     "history_state_util_unittest.mm",
     "network_context_owner_unittest.cc",
@@ -503,6 +504,7 @@ source_set("ios_web_web_state_ui_unittests") {
     "web_state/ui/crw_web_view_scroll_view_proxy_unittest.mm",
     "web_state/ui/html_element_fetch_request_unittest.mm",
     "web_state/ui/web_view_js_utils_unittest.mm",
+    "web_state/ui/wk_content_rule_list_util_unittest.mm",
     "web_state/ui/wk_web_view_configuration_provider_unittest.mm",
   ]
 }
@@ -581,7 +583,9 @@ test("ios_web_inttests") {
   ]
   sources = [
     "browser_state_web_view_partition_inttest.mm",
+    "cookie_blocking_inttest.mm",
     "find_in_page/find_in_page_manager_inttest.mm",
+    "navigation/crw_wk_navigation_handler_inttest.mm",
     "navigation/error_page_helper_inttest.mm",
     "navigation/history_state_operations_inttest.mm",
     "navigation/meta_tag_inttest.mm",
@@ -624,7 +628,9 @@ js_compile_bundle("all_frames_web_bundle") {
     "web_state/js/resources/all_frames_web_bundle.js",
     "web_state/js/resources/base.js",
     "web_state/js/resources/common.js",
+    "web_state/js/resources/cookie.js",
     "web_state/js/resources/find_in_page.js",
+    "web_state/js/resources/share_workaround.js",
   ]
 }
 
diff --git a/chromium/ios/web/common/BUILD.gn b/chromium/ios/web/common/BUILD.gn
index 51d0f5f60a3..338bac02fab 100644
--- a/chromium/ios/web/common/BUILD.gn
+++ b/chromium/ios/web/common/BUILD.gn
@@ -21,6 +21,7 @@ source_set("common") {
 
   deps = [
     "//base",
+    "//ios/third_party/webkit",
     "//ios/web/public/navigation",
     "//net",
     "//services/network/public/cpp",
diff --git a/chromium/ios/web/download/BUILD.gn b/chromium/ios/web/download/BUILD.gn
index a6665e43e60..97b6af85329 100644
--- a/chromium/ios/web/download/BUILD.gn
+++ b/chromium/ios/web/download/BUILD.gn
@@ -33,6 +33,7 @@ source_set("download_cookies") {
   visibility = [ ":*" ]
 
   deps = [
+    "//base",
     "//ios/net",
     "//net",
   ]
diff --git a/chromium/ios/web/navigation/BUILD.gn b/chromium/ios/web/navigation/BUILD.gn
index d186c122e23..873de4df891 100644
--- a/chromium/ios/web/navigation/BUILD.gn
+++ b/chromium/ios/web/navigation/BUILD.gn
@@ -57,8 +57,6 @@ source_set("navigation") {
     "navigation_item_impl_list.mm",
     "navigation_item_storage_builder.h",
     "navigation_item_storage_builder.mm",
-    "nscoder_util.h",
-    "nscoder_util.mm",
     "serializable_user_data_manager_impl.h",
     "serializable_user_data_manager_impl.mm",
     "session_storage_builder.h",
@@ -86,6 +84,7 @@ source_set("core") {
     "//base",
     "//components/url_formatter:url_formatter",
     "//ios/web/common:features",
+    "//ios/web/common:user_agent",
     "//ios/web/navigation:wk_navigation_util",
     "//ios/web/public",
     "//ios/web/public/deprecated:deprecated_navigation_util",
@@ -119,6 +118,8 @@ source_set("wk_navigation_util") {
   ]
 
   sources = [
+    "nscoder_util.h",
+    "nscoder_util.mm",
     "wk_navigation_util.h",
     "wk_navigation_util.mm",
   ]
diff --git a/chromium/ios/web/public/BUILD.gn b/chromium/ios/web/public/BUILD.gn
index bdfdd918b19..fe158c19610 100644
--- a/chromium/ios/web/public/BUILD.gn
+++ b/chromium/ios/web/public/BUILD.gn
@@ -7,6 +7,7 @@ import("//ios/build/config.gni")
 source_set("public") {
   public_deps = [
     ":web_state_observer",
+    "//ios/web/public/browsing_data",
     "//ios/web/public/favicon",
     "//ios/web/public/navigation",
     "//ios/web/public/thread",
diff --git a/chromium/ios/web/public/browsing_data/BUILD.gn b/chromium/ios/web/public/browsing_data/BUILD.gn
index b64bd947690..2ee6ef21e98 100644
--- a/chromium/ios/web/public/browsing_data/BUILD.gn
+++ b/chromium/ios/web/public/browsing_data/BUILD.gn
@@ -7,8 +7,11 @@ import("//ios/build/config.gni")
 source_set("browsing_data") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
+  deps = [ "//base" ]
+
   sources = [
     "browsing_data_removing_util.h",
+    "cookie_blocking_mode.h",
     "system_cookie_store_util.h",
   ]
 }
diff --git a/chromium/ios/web/public/test/BUILD.gn b/chromium/ios/web/public/test/BUILD.gn
index 59e41103b92..9a6f8abb406 100644
--- a/chromium/ios/web/public/test/BUILD.gn
+++ b/chromium/ios/web/public/test/BUILD.gn
@@ -82,6 +82,8 @@ source_set("util") {
   sources = [
     "error_test_util.h",
     "error_test_util.mm",
+    "js_test_storage_util.h",
+    "js_test_storage_util.mm",
     "js_test_util.h",
     "js_test_util.mm",
     "navigation_test_util.h",
diff --git a/chromium/ios/web/session/BUILD.gn b/chromium/ios/web/session/BUILD.gn
index 3cdd37c5fc7..62c50691c49 100644
--- a/chromium/ios/web/session/BUILD.gn
+++ b/chromium/ios/web/session/BUILD.gn
@@ -6,6 +6,8 @@ source_set("session") {
   configs += [ "//build/config/compiler:enable_arc" ]
   deps = [
     "//base",
+    "//ios/web/common:features",
+    "//ios/web/navigation:wk_navigation_util",
     "//ios/web/public",
     "//ios/web/public/security",
     "//ios/web/public/session",
diff --git a/chromium/ios/web/shell/test/BUILD.gn b/chromium/ios/web/shell/test/BUILD.gn
index 7d293ddc9f3..bc89e7f700c 100644
--- a/chromium/ios/web/shell/test/BUILD.gn
+++ b/chromium/ios/web/shell/test/BUILD.gn
@@ -11,7 +11,6 @@ group("all_tests") {
   deps = [
     ":ios_web_shell_eg2tests",
     ":ios_web_shell_eg2tests_module",
-    ":ios_web_shell_egtests",
   ]
 }
 
@@ -29,6 +28,7 @@ ios_eg_test("ios_web_shell_egtests") {
     "//base/test:test_support",
     "//ios/testing:http_server_bundle_data",
     "//ios/testing/earl_grey:earl_grey_support",
+    "//ios/third_party/webkit",
     "//ios/web",
     "//ios/web:earl_grey_test_support",
     "//ios/web/public/test",
diff --git a/chromium/ios/web/test/BUILD.gn b/chromium/ios/web/test/BUILD.gn
index 8134126797e..16539ceebe1 100644
--- a/chromium/ios/web/test/BUILD.gn
+++ b/chromium/ios/web/test/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//ios/web/js_compile.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/grit/repack.gni")
@@ -50,9 +51,11 @@ source_set("test_support") {
   public_deps = [ "//testing/gtest" ]
 
   deps = [
+    ":all_frames_web_test_bundle",
     ":test_constants",
     "//base",
     "//base/test:test_support",
+    "//components/crash/core/common",
     "//ios/testing:verify_custom_webkit",
     "//ios/web",
     "//ios/web/common:web_view_creation_util",
@@ -87,3 +90,13 @@ source_set("test_constants") {
     "test_url_constants.h",
   ]
 }
+
+js_compile_bundle("all_frames_web_test_bundle") {
+  testonly = true
+  closure_entry_point = "__crWeb.allFramesWebTestBundle"
+
+  sources = [
+    "resources/all_frames_web_test_bundle.js",
+    "resources/cookie_test.js",
+  ]
+}
diff --git a/chromium/ios/web/web_state/BUILD.gn b/chromium/ios/web/web_state/BUILD.gn
index fa4bb9b18e4..3bf748f8dca 100644
--- a/chromium/ios/web/web_state/BUILD.gn
+++ b/chromium/ios/web/web_state/BUILD.gn
@@ -122,6 +122,7 @@ source_set("user_interaction") {
 
   deps = [
     "//base",
+    "//ios/third_party/webkit",
     "//url",
   ]
 
diff --git a/chromium/ios/web/web_state/ui/BUILD.gn b/chromium/ios/web/web_state/ui/BUILD.gn
index 5f89ebeb49f..216fcbb8679 100644
--- a/chromium/ios/web/web_state/ui/BUILD.gn
+++ b/chromium/ios/web/web_state/ui/BUILD.gn
@@ -47,6 +47,8 @@ source_set("ui") {
   ]
 
   sources = [
+    "cookie_blocking_error_logger.h",
+    "cookie_blocking_error_logger.mm",
     "crw_swipe_recognizer_provider.h",
     "crw_touch_tracking_recognizer.h",
     "crw_touch_tracking_recognizer.mm",
@@ -124,6 +126,10 @@ source_set("wk_web_view_configuration_provider") {
   ]
 
   sources = [
+    "wk_content_rule_list_provider.h",
+    "wk_content_rule_list_provider.mm",
+    "wk_content_rule_list_util.h",
+    "wk_content_rule_list_util.mm",
     "wk_web_view_configuration_provider.h",
     "wk_web_view_configuration_provider.mm",
     "wk_web_view_configuration_provider_observer.h",