From b014812705fc80bff0a5c120dfcef88f349816dc Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 24 Aug 2018 12:15:48 +0200
Subject: BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 chromium/ios/chrome/browser/web/BUILD.gn | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'chromium/ios/chrome/browser/web/BUILD.gn')

diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn
index 91ad5817763..2fbec3a9017 100644
--- a/chromium/ios/chrome/browser/web/BUILD.gn
+++ b/chromium/ios/chrome/browser/web/BUILD.gn
@@ -9,6 +9,8 @@ source_set("web") {
   sources = [
     "dom_altering_lock.h",
     "dom_altering_lock.mm",
+    "error_page_util.h",
+    "error_page_util.mm",
     "load_timing_tab_helper.h",
     "load_timing_tab_helper.mm",
     "mailto_handler.h",
@@ -33,6 +35,8 @@ source_set("web") {
   deps = [
     ":tab_helper_delegates",
     "//base",
+    "//components/error_page/common",
+    "//components/resources:components_resources_grit",
     "//components/strings",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser",
@@ -42,6 +46,7 @@ source_set("web") {
     "//ios/chrome/browser/ui/commands:commands",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/util:util",
+    "//ios/net",
     "//ios/web",
     "//ui/base",
     "//url",
@@ -75,6 +80,7 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "error_page_util_unittest.mm",
     "load_timing_tab_helper_unittest.mm",
     "mailto_handler_gmail_unittest.mm",
     "mailto_handler_inbox_unittest.mm",
@@ -93,6 +99,7 @@ source_set("unit_tests") {
     ":web",
     "//base:base",
     "//base/test:test_support",
+    "//components/strings:components_strings_grit",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/test:test_support",
@@ -169,7 +176,6 @@ source_set("web_internal") {
     "//base",
     "//components/content_settings/core/browser",
     "//components/dom_distiller/core",
-    "//components/error_page/common",
     "//components/infobars/core",
     "//components/payments/core",
     "//components/prefs",
@@ -251,6 +257,7 @@ source_set("unit_tests_internal") {
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/web",
     "//ios/web",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
@@ -269,6 +276,7 @@ source_set("eg_tests") {
     "browsing_prevent_default_egtest.mm",
     "cache_egtest.mm",
     "child_window_open_by_dom_egtest.mm",
+    "error_page_egtest.mm",
     "forms_egtest.mm",
     "http_auth_egtest.mm",
     "js_print_egtest.mm",
@@ -294,6 +302,7 @@ source_set("eg_tests") {
     "//ios/chrome/test:test_support",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
+    "//ios/testing:embedded_test_server_support",
     "//ios/testing:ios_test_support",
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/earl_grey:earl_grey+link",
-- 
cgit v1.2.1