BASELINE: Update Chromium to 66.0.3359.156

Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

7 files changed, 44 insertions, 6 deletions

diff --git a/chromium/services/test/BUILD.gn b/chromium/services/test/BUILD.gn
index df1f2194505..7bd581fc541 100644
--- a/chromium/services/test/BUILD.gn
+++ b/chromium/services/test/BUILD.gn
@@ -22,6 +22,14 @@ source_set("run_all_service_tests") {
     "//ui/base",
   ]
 
+  if (is_ios) {
+    deps += [ ":tests_bundle_data" ]
+  } else {
+    data = [
+      "data/",
+    ]
+  }
+
   data_deps = [
     "//ui/resources:ui_test_pak_data",
   ]
@@ -34,3 +42,33 @@ source_set("run_all_service_tests") {
     deps += [ "//ui/ozone" ]
   }
 }
+
+bundle_data("tests_bundle_data") {
+  visibility = [ ":run_all_service_tests" ]
+  testonly = true
+  sources = [
+    "//services/test/data/content-sniffer-test0.html",
+    "//services/test/data/content-sniffer-test0.html.mock-http-headers",
+    "//services/test/data/content-sniffer-test1.html",
+    "//services/test/data/content-sniffer-test1.html.mock-http-headers",
+    "//services/test/data/content-sniffer-test2.html",
+    "//services/test/data/content-sniffer-test2.html.mock-http-headers",
+    "//services/test/data/content-sniffer-test4.html",
+    "//services/test/data/content-sniffer-test4.html.mock-http-headers",
+    "//services/test/data/empty.html",
+    "//services/test/data/hello.html",
+    "//services/test/data/hello.html.mock-http-headers",
+    "//services/test/data/nocache.html",
+    "//services/test/data/nocache.html.mock-http-headers",
+    "//services/test/data/nosniff-test.html",
+    "//services/test/data/nosniff-test.html.mock-http-headers",
+    "//services/test/data/redirect307-to-echo",
+    "//services/test/data/redirect307-to-echo.mock-http-headers",
+    "//services/test/data/simple_page.html",
+    "//services/test/data/title1.html",
+  ]
+  outputs = [
+    "{{bundle_resources_dir}}/" +
+        "{{source_root_relative_dir}}/{{source_file_part}}",
+  ]
+}
diff --git a/chromium/services/test/echo/BUILD.gn b/chromium/services/test/echo/BUILD.gn
index 8aa585f4c86..86705cffbd6 100644
--- a/chromium/services/test/echo/BUILD.gn
+++ b/chromium/services/test/echo/BUILD.gn
@@ -15,8 +15,8 @@ source_set("lib") {
   deps = [
     "//base",
     "//services/service_manager/public/cpp",
-    "//services/service_manager/public/interfaces",
-    "//services/test/echo/public/interfaces",
+    "//services/service_manager/public/mojom",
+    "//services/test/echo/public/mojom",
   ]
 }
 
diff --git a/chromium/services/test/echo/public/interfaces/BUILD.gn b/chromium/services/test/echo/public/mojom/BUILD.gn
index d50f842bb0d..4027a8abe24 100644
--- a/chromium/services/test/echo/public/interfaces/BUILD.gn
+++ b/chromium/services/test/echo/public/mojom/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-mojom("interfaces") {
+mojom("mojom") {
   sources = [
     "echo.mojom",
   ]
diff --git a/chromium/services/test/echo/public/interfaces/echo.mojom b/chromium/services/test/echo/public/mojom/echo.mojom
index 412364e7d55..412364e7d55 100644
--- a/chromium/services/test/echo/public/interfaces/echo.mojom
+++ b/chromium/services/test/echo/public/mojom/echo.mojom
diff --git a/chromium/services/test/user_id/BUILD.gn b/chromium/services/test/user_id/BUILD.gn
index b8853ec8708..f93b129c4b8 100644
--- a/chromium/services/test/user_id/BUILD.gn
+++ b/chromium/services/test/user_id/BUILD.gn
@@ -15,8 +15,8 @@ source_set("lib") {
   deps = [
     "//base",
     "//services/service_manager/public/cpp",
-    "//services/service_manager/public/interfaces",
-    "//services/test/user_id/public/interfaces",
+    "//services/service_manager/public/mojom",
+    "//services/test/user_id/public/mojom",
   ]
 }
 
diff --git a/chromium/services/test/user_id/public/interfaces/BUILD.gn b/chromium/services/test/user_id/public/mojom/BUILD.gn
index a87f2fca799..7208bd715f6 100644
--- a/chromium/services/test/user_id/public/interfaces/BUILD.gn
+++ b/chromium/services/test/user_id/public/mojom/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-mojom("interfaces") {
+mojom("mojom") {
   sources = [
     "user_id.mojom",
   ]
diff --git a/chromium/services/test/user_id/public/interfaces/user_id.mojom b/chromium/services/test/user_id/public/mojom/user_id.mojom
index a22579f2174..a22579f2174 100644
--- a/chromium/services/test/user_id/public/interfaces/user_id.mojom
+++ b/chromium/services/test/user_id/public/mojom/user_id.mojom