BASELINE: Update Chromium to 68.0.3440.125

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

4 files changed, 10 insertions, 10 deletions

diff --git a/chromium/components/nacl/broker/BUILD.gn b/chromium/components/nacl/broker/BUILD.gn
index fe238f39d88..14641bdd76b 100644
--- a/chromium/components/nacl/broker/BUILD.gn
+++ b/chromium/components/nacl/broker/BUILD.gn
@@ -31,6 +31,7 @@ source_set("broker") {
     "//mojo/edk",
     "//sandbox",
     "//services/service_manager/public/cpp",
+    "//services/service_manager/zygote:zygote_buildflags",
   ]
 
   if (current_cpu == target_cpu) {
@@ -49,13 +50,6 @@ source_set("content_dummy") {
     "//content/public/common/sandbox_init.h",
     "//content/public/common/sandboxed_process_launcher_delegate.h",
   ]
-
-  deps = [
-    # sandboxed_process_launcher_delegate.h includes headers generated from
-    # //content/public/common:zygote_buildflags, so this target needs to have a
-    # dep on it as well.
-    "//content/public/common:zygote_buildflags",
-  ]
 }
 
 if (current_cpu == "x86") {
@@ -151,9 +145,9 @@ if (current_cpu == "x86") {
     deps = [
       "//base",
       "//content/public/common:static_switches",
-      "//content/public/common:zygote_buildflags",
       "//sandbox",
       "//services/service_manager/sandbox",
+      "//services/service_manager/zygote:zygote_buildflags",
     ]
   }
 
diff --git a/chromium/components/nacl/browser/BUILD.gn b/chromium/components/nacl/browser/BUILD.gn
index 43079fb0f11..0f5426351f6 100644
--- a/chromium/components/nacl/browser/BUILD.gn
+++ b/chromium/components/nacl/browser/BUILD.gn
@@ -39,13 +39,13 @@ static_library("browser") {
     "//components/url_formatter",
     "//content/public/browser",
     "//content/public/common",
-    "//content/public/common:zygote_buildflags",
     "//mojo/edk",
     "//native_client/src/trusted/service_runtime:sel_main_chrome",
     "//net",
     "//ppapi/host",
     "//ppapi/proxy:ipc",
     "//ppapi/shared_impl",
+    "//services/service_manager/zygote:zygote_buildflags",
   ]
 
   public_deps = [
@@ -65,6 +65,7 @@ static_library("browser") {
       "//components/nacl/loader:nacl_helper_integration",
       "//sandbox/linux:sandbox_services",
       "//sandbox/linux:suid_sandbox_client",
+      "//services/service_manager/zygote",
     ]
 
     if (enable_nacl_nonsfi) {
diff --git a/chromium/components/nacl/common/BUILD.gn b/chromium/components/nacl/common/BUILD.gn
index df8a120c317..8f9ef992673 100644
--- a/chromium/components/nacl/common/BUILD.gn
+++ b/chromium/components/nacl/common/BUILD.gn
@@ -51,7 +51,6 @@ if (enable_nacl) {
     sources = [
       "//content/public/common/content_descriptors.h",
       "//content/public/common/content_switches.h",
-      "//content/public/common/mojo_channel_switches.h",
       "//content/public/common/process_type.h",
     ]
 
diff --git a/chromium/components/nacl/loader/BUILD.gn b/chromium/components/nacl/loader/BUILD.gn
index b125e1a663c..c468773ce22 100644
--- a/chromium/components/nacl/loader/BUILD.gn
+++ b/chromium/components/nacl/loader/BUILD.gn
@@ -43,6 +43,10 @@ source_set("minimal") {
     "//sandbox",
     "//services/service_manager/public/cpp",
   ]
+
+  if (is_linux) {
+    deps += [ "//services/service_manager/zygote" ]
+  }
 }
 
 # This exists just to make 'gn check' happy with :minimal and
@@ -129,6 +133,7 @@ if (is_linux) {
       "//mojo/edk",
       "//sandbox/linux:sandbox_services",
       "//services/service_manager/sandbox",
+      "//services/service_manager/zygote",
       "//url/ipc:url_ipc",
     ]
 
@@ -249,6 +254,7 @@ if (is_nacl_nonsfi) {
       "//sandbox/linux:sandbox",
       "//services/service_manager/public/cpp",
       "//services/service_manager/sandbox",
+      "//services/service_manager/zygote:zygote_util",
     ]
   }