BASELINE: Update Chromium to 85.0.4183.14085-based

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

2 files changed, 3 insertions, 5 deletions

diff --git a/chromium/content/public/app/content_main_delegate.cc b/chromium/content/public/app/content_main_delegate.cc
index ed5b0e2c0b4..02985a525c9 100644
--- a/chromium/content/public/app/content_main_delegate.cc
+++ b/chromium/content/public/app/content_main_delegate.cc
@@ -27,8 +27,7 @@ int ContentMainDelegate::RunProcess(
 #if defined(OS_LINUX)
 
 void ContentMainDelegate::ZygoteStarting(
-    std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>*
-        delegates) {}
+    std::vector<std::unique_ptr<ZygoteForkDelegate>>* delegates) {}
 
 #endif  // defined(OS_LINUX)
 
diff --git a/chromium/content/public/app/content_main_delegate.h b/chromium/content/public/app/content_main_delegate.h
index 2d9ee9fa20a..0ca924769b9 100644
--- a/chromium/content/public/app/content_main_delegate.h
+++ b/chromium/content/public/app/content_main_delegate.h
@@ -21,7 +21,6 @@ class CommandLine;
 namespace service_manager {
 class BackgroundServiceManager;
 class Identity;
-class ZygoteForkDelegate;
 }  // namespace service_manager
 
 namespace content {
@@ -31,6 +30,7 @@ class ContentClient;
 class ContentGpuClient;
 class ContentRendererClient;
 class ContentUtilityClient;
+class ZygoteForkDelegate;
 struct MainFunctionParams;
 
 class CONTENT_EXPORT ContentMainDelegate {
@@ -65,8 +65,7 @@ class CONTENT_EXPORT ContentMainDelegate {
   // specify one or more zygote delegates if it wishes by storing them in
   // |*delegates|.
   virtual void ZygoteStarting(
-      std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>*
-          delegates);
+      std::vector<std::unique_ptr<ZygoteForkDelegate>>* delegates);
 
   // Called every time the zygote process forks.
   virtual void ZygoteForked() {}