BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

5 files changed, 12 insertions, 0 deletions

diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn
index 6ce8d9641f5..f1ca8e40690 100644
--- a/chromium/ios/web/BUILD.gn
+++ b/chromium/ios/web/BUILD.gn
@@ -62,6 +62,7 @@ source_set("web") {
     "crw_navigation_item_storage.mm",
     "features.mm",
     "load_committed_details.cc",
+    "network_context_owner.cc",
     "service_manager_connection_impl.cc",
     "service_manager_connection_impl.h",
     "service_manager_context.h",
@@ -207,10 +208,12 @@ source_set("ios_web_general_unittests") {
   sources = [
     "browser_state_unittest.cc",
     "history_state_util_unittest.mm",
+    "network_context_owner_unittest.cc",
     "service_manager_connection_impl_unittest.cc",
     "test/web_test_unittest.mm",
     "url_scheme_util_unittest.mm",
     "url_util_unittest.cc",
+    "web_client_unittest.mm",
   ]
 }
 
@@ -249,6 +252,7 @@ source_set("ios_web_navigation_unittests") {
     "navigation/crw_navigation_item_storage_unittest.mm",
     "navigation/crw_session_controller_unittest.mm",
     "navigation/crw_session_storage_unittest.mm",
+    "navigation/error_retry_state_machine_unittest.mm",
     "navigation/navigation_item_impl_unittest.mm",
     "navigation/navigation_item_storage_test_util.h",
     "navigation/navigation_item_storage_test_util.mm",
@@ -540,6 +544,7 @@ test("ios_web_inttests") {
   deps = [
     ":web",
     "//base/test:test_support",
+    "//ios/testing:embedded_test_server_support",
     "//ios/testing:http_server_bundle_data",
     "//ios/testing:ios_test_support",
     "//ios/web:resources_grit",
@@ -567,6 +572,7 @@ test("ios_web_inttests") {
     "public/test/http_server_inttest.mm",
     "test/run_all_unittests.cc",
     "url_loader_inttest.mm",
+    "web_state/error_page_inttest.mm",
     "web_state/favicon_callbacks_inttest.mm",
     "web_state/http_auth_inttest.mm",
     "web_state/navigation_and_load_callbacks_inttest.mm",
diff --git a/chromium/ios/web/js_compile.gni b/chromium/ios/web/js_compile.gni
index 82e6ceb17d1..83bcc0b7dd7 100644
--- a/chromium/ios/web/js_compile.gni
+++ b/chromium/ios/web/js_compile.gni
@@ -196,6 +196,7 @@ template("js_compile_checked") {
     }
   } else {
     bundle_data(target_name) {
+      not_needed(invoker, [ "js_modules" ])
       forward_variables_from(invoker,
                              [
                                "data_deps",
diff --git a/chromium/ios/web/navigation/BUILD.gn b/chromium/ios/web/navigation/BUILD.gn
index cda071a5219..4ecba639794 100644
--- a/chromium/ios/web/navigation/BUILD.gn
+++ b/chromium/ios/web/navigation/BUILD.gn
@@ -53,6 +53,8 @@ source_set("core") {
   ]
 
   sources = [
+    "error_retry_state_machine.h",
+    "error_retry_state_machine.mm",
     "navigation_item_impl.h",
     "navigation_item_impl.mm",
     "navigation_manager_delegate.h",
diff --git a/chromium/ios/web/public/test/BUILD.gn b/chromium/ios/web/public/test/BUILD.gn
index 2b10807247a..c04ae2cb72d 100644
--- a/chromium/ios/web/public/test/BUILD.gn
+++ b/chromium/ios/web/public/test/BUILD.gn
@@ -27,6 +27,8 @@ source_set("test") {
   allow_circular_includes_from = [ "//ios/web/test:test_support" ]
 
   sources = [
+    "error_test_util.h",
+    "error_test_util.mm",
     "js_test_util.h",
     "js_test_util.mm",
     "native_controller_test_util.h",
diff --git a/chromium/ios/web/web_state/BUILD.gn b/chromium/ios/web/web_state/BUILD.gn
index 6d6813af5dc..0768b04a0df 100644
--- a/chromium/ios/web/web_state/BUILD.gn
+++ b/chromium/ios/web/web_state/BUILD.gn
@@ -101,6 +101,7 @@ source_set("session_certificate_policy_cache") {
 source_set("error_translation_util") {
   deps = [
     "//base",
+    "//ios/net",
     "//net",
   ]