BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 13 insertions, 1 deletions

diff --git a/chromium/docs/mojo_and_services.md b/chromium/docs/mojo_and_services.md
index 2aff980269f..46c2c5611b5 100644
--- a/chromium/docs/mojo_and_services.md
+++ b/chromium/docs/mojo_and_services.md
@@ -398,7 +398,6 @@ API:
 mojo::Remote<math::mojom::MathService> math_service =
     content::ServiceProcessHost::Launch<math::mojom::MathService>(
         content::ServiceProcessHost::LaunchOptions()
-            .WithSandboxType(content::SandboxType::kUtility)
             .WithDisplayName("Math!")
             .Pass());
 ```
@@ -423,6 +422,19 @@ NOTE: To ensure the execution of the response callback, the
 and [this note from an earlier section](#sending-a-message)).
 ***
 
+### Using a non-standard sandbox
+
+Ideally services will run inside the utility process sandbox, in which
+case there is nothing else to do. For services that need a custom
+sandbox, a new sandbox type must be defined in consultation with
+security-dev@chromium.org.  To launch with a custom sandbox a
+specialization of `GetServiceSandboxType()` must be supplied in an
+appropriate `service_sandbox_type.h` such as
+[`//chrome/browser/service_sandbox_type.h`](https://cs.chromium.org/chromium/src/chrome/browser/service_sandbox_type.h)
+or
+[`//content/browser/service_sandbox_type.h`](https://cs.chromium.org/chromium/src/content/browser/service_sandbox_type.h)
+and included where `ServiceProcessHost::Launch()` is called.
+
 ## Content-Layer Services Overview
 
 ### Interface Brokers