BASELINE: Update Chromium to 85.0.4183.14085-based

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

2 files changed, 8 insertions, 47 deletions

diff --git a/chromium/chrome/browser/ui/webui/sandbox/sandbox_handler.cc b/chromium/chrome/browser/ui/webui/sandbox/sandbox_handler.cc
index 186ef33a6d4..747c8494454 100644
--- a/chromium/chrome/browser/ui/webui/sandbox/sandbox_handler.cc
+++ b/chromium/chrome/browser/ui/webui/sandbox/sandbox_handler.cc
@@ -8,7 +8,6 @@
 
 #include "base/bind.h"
 #include "base/numerics/safe_conversions.h"
-#include "base/task/post_task.h"
 #include "base/values.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "content/public/browser/browser_task_traits.h"
@@ -27,44 +26,6 @@ using content::RenderProcessHost;
 namespace sandbox_handler {
 namespace {
 
-// This only includes OS_WIN included SandboxType values.
-std::string GetSandboxTypeInEnglish(content::SandboxType sandbox_type) {
-  switch (sandbox_type) {
-    case content::SandboxType::kNoSandbox:
-      return "Unsandboxed";
-    case content::SandboxType::kNoSandboxAndElevatedPrivileges:
-      return "Unsandboxed (Elevated)";
-    case content::SandboxType::kXrCompositing:
-      return "XR Compositing";
-    case content::SandboxType::kRenderer:
-      return "Renderer";
-    case content::SandboxType::kUtility:
-      return "Utility";
-    case content::SandboxType::kGpu:
-      return "GPU";
-    case content::SandboxType::kPpapi:
-      return "PPAPI";
-    case content::SandboxType::kNetwork:
-      return "Network";
-    case content::SandboxType::kCdm:
-      return "CDM";
-    case content::SandboxType::kPrintCompositor:
-      return "Print Compositor";
-    case content::SandboxType::kAudio:
-      return "Audio";
-    case content::SandboxType::kSpeechRecognition:
-      return "Speech Recognition";
-    case content::SandboxType::kProxyResolver:
-      return "Proxy Resolver";
-    case content::SandboxType::kPdfConversion:
-      return "PDF Conversion";
-    case content::SandboxType::kSharingService:
-      return "Sharing";
-    case content::SandboxType::kVideoCapture:
-      return "Video Capture";
-  }
-}
-
 base::Value FetchBrowserChildProcesses() {
   // The |BrowserChildProcessHostIterator| must only be used on the IO thread.
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
@@ -85,7 +46,8 @@ base::Value FetchBrowserChildProcesses() {
     proc.SetPath("metricsName", base::Value(process_data.metrics_name));
     proc.SetPath(
         "sandboxType",
-        base::Value(GetSandboxTypeInEnglish(process_data.sandbox_type)));
+        base::Value(service_manager::SandboxWin::GetSandboxTypeInEnglish(
+            process_data.sandbox_type)));
     browser_processes.Append(std::move(proc));
   }
 
@@ -136,9 +98,8 @@ void SandboxHandler::HandleRequestSandboxDiagnostics(
 
   AllowJavascript();
 
-  base::PostTaskAndReplyWithResult(
-      FROM_HERE, {content::BrowserThread::IO},
-      base::BindOnce(&FetchBrowserChildProcesses),
+  content::GetIOThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE, base::BindOnce(&FetchBrowserChildProcesses),
       base::BindOnce(&SandboxHandler::FetchBrowserChildProcessesCompleted,
                      weak_ptr_factory_.GetWeakPtr()));
 }
@@ -157,8 +118,8 @@ void SandboxHandler::FetchBrowserChildProcessesCompleted(
 void SandboxHandler::FetchSandboxDiagnosticsCompleted(
     base::Value sandbox_policies) {
   sandbox_policies_ = std::move(sandbox_policies);
-  base::PostTask(FROM_HERE, {content::BrowserThread::UI},
-                 base::BindOnce(&SandboxHandler::GetRendererProcessesAndFinish,
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE, base::BindOnce(&SandboxHandler::GetRendererProcessesAndFinish,
                                 weak_ptr_factory_.GetWeakPtr()));
 }
 
diff --git a/chromium/chrome/browser/ui/webui/sandbox/sandbox_internals_ui.cc b/chromium/chrome/browser/ui/webui/sandbox/sandbox_internals_ui.cc
index 40567210a5a..481b12ba8bf 100644
--- a/chromium/chrome/browser/ui/webui/sandbox/sandbox_internals_ui.cc
+++ b/chromium/chrome/browser/ui/webui/sandbox/sandbox_internals_ui.cc
@@ -25,8 +25,8 @@
 #endif
 
 #if defined(OS_LINUX)
+#include "content/public/browser/zygote_host/zygote_host_linux.h"
 #include "services/service_manager/sandbox/sandbox.h"
-#include "services/service_manager/zygote/zygote_host_linux.h"
 #endif
 
 namespace {
@@ -35,7 +35,7 @@ namespace {
 static void SetSandboxStatusData(content::WebUIDataSource* source) {
   // Get expected sandboxing status of renderers.
   const int status =
-      service_manager::ZygoteHost::GetInstance()->GetRendererSandboxStatus();
+      content::ZygoteHost::GetInstance()->GetRendererSandboxStatus();
 
   source->AddBoolean("suid", status & service_manager::SandboxLinux::kSUID);
   source->AddBoolean("userNs", status & service_manager::SandboxLinux::kUserNS);