From 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 5 Apr 2017 17:15:33 +0200
Subject: BASELINE: Update Chromium to 58.0.3029.54

Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
---
 chromium/components/nacl/broker/BUILD.gn | 5 -----
 chromium/components/nacl/common/BUILD.gn | 1 -
 chromium/components/nacl/loader/BUILD.gn | 4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'chromium/components/nacl')

diff --git a/chromium/components/nacl/broker/BUILD.gn b/chromium/components/nacl/broker/BUILD.gn
index 3a2b3607918..252ab4da2cb 100644
--- a/chromium/components/nacl/broker/BUILD.gn
+++ b/chromium/components/nacl/broker/BUILD.gn
@@ -38,10 +38,6 @@ source_set("broker") {
   } else {
     deps += [ ":content_dummy" ]
   }
-
-  data_deps = [
-    ":nacl_broker_manifest",
-  ]
 }
 
 # This exists just to make 'gn check' happy with :broker.  It can't depend
@@ -171,7 +167,6 @@ if (current_cpu == "x86") {
       "//components/policy:generated",
       "//content/public/common:static_switches",
       "//ipc",
-      "//third_party/kasko",
     ]
   }
 }
diff --git a/chromium/components/nacl/common/BUILD.gn b/chromium/components/nacl/common/BUILD.gn
index de3d4694f42..8859d086d4d 100644
--- a/chromium/components/nacl/common/BUILD.gn
+++ b/chromium/components/nacl/common/BUILD.gn
@@ -36,7 +36,6 @@ if (enable_nacl) {
       "//base:base_static",
       "//content/public/common:service_names",
       "//ipc",
-      "//ipc:mojom",
       "//mojo/edk/system",
       "//services/service_manager/public/cpp",
     ]
diff --git a/chromium/components/nacl/loader/BUILD.gn b/chromium/components/nacl/loader/BUILD.gn
index e770d17b42f..74edc91a3fa 100644
--- a/chromium/components/nacl/loader/BUILD.gn
+++ b/chromium/components/nacl/loader/BUILD.gn
@@ -51,7 +51,7 @@ source_set("minimal") {
 source_set("minimal_content_dummy") {
   check_includes = false
   sources = [
-    "//content/public/common/child_process_sandbox_support_linux.h",
+    "//content/public/child/child_process_sandbox_support_linux.h",
     "//content/public/common/main_function_params.h",
     "//content/public/common/sandbox_init.h",
   ]
@@ -68,13 +68,13 @@ source_set("loader") {
   ]
   deps = [
     "//components/nacl/common",
+    "//content/public/child",
     "//content/public/common",
     "//ppapi/shared_impl",
     "//services/service_manager/public/cpp",
   ]
 
   data_deps = [
-    ":nacl_loader_manifest",
     "//ppapi/native_client:irt",
     "//ppapi/native_client/src/untrusted/pnacl_support_extension",
   ]
-- 
cgit v1.2.1