BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 3 insertions, 14 deletions

diff --git a/chromium/components/spellcheck/common/spellcheck_features.cc b/chromium/components/spellcheck/common/spellcheck_features.cc
index 0732801e2f2..445941b1a2a 100644
--- a/chromium/components/spellcheck/common/spellcheck_features.cc
+++ b/chromium/components/spellcheck/common/spellcheck_features.cc
@@ -13,11 +13,6 @@ namespace spellcheck {
 
 #if BUILDFLAG(ENABLE_SPELLCHECK)
 
-#if BUILDFLAG(USE_WIN_HYBRID_SPELLCHECKER)
-const base::Feature kWinUseHybridSpellChecker{
-    "WinUseHybridSpellChecker", base::FEATURE_DISABLED_BY_DEFAULT};
-#endif  // BUILDFLAG(USE_WIN_HYBRID_SPELLCHECKER)
-
 bool UseBrowserSpellChecker() {
 #if !BUILDFLAG(USE_BROWSER_SPELLCHECKER)
   return false;
@@ -33,19 +28,13 @@ bool UseBrowserSpellChecker() {
 const base::Feature kWinUseBrowserSpellChecker{
     "WinUseBrowserSpellChecker", base::FEATURE_DISABLED_BY_DEFAULT};
 
+const base::Feature kWinDelaySpellcheckServiceInit{
+    "WinDelaySpellcheckServiceInit", base::FEATURE_DISABLED_BY_DEFAULT};
+
 bool WindowsVersionSupportsSpellchecker() {
   return base::win::GetVersion() > base::win::Version::WIN7 &&
          base::win::GetVersion() < base::win::Version::WIN_LAST;
 }
-
-bool UseWinHybridSpellChecker() {
-#if BUILDFLAG(USE_WIN_HYBRID_SPELLCHECKER)
-  return base::FeatureList::IsEnabled(spellcheck::kWinUseHybridSpellChecker) &&
-         UseBrowserSpellChecker();
-#else
-  return false;
-#endif
-}
 #endif  // defined(OS_WIN)
 
 #if defined(OS_ANDROID)