BASELINE: Update Chromium to 85.0.4183.14085-based

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

3 files changed, 2 insertions, 27 deletions

diff --git a/chromium/components/language/core/common/language_experiments.cc b/chromium/components/language/core/common/language_experiments.cc
index 17da166b899..7ea587f0d74 100644
--- a/chromium/components/language/core/common/language_experiments.cc
+++ b/chromium/components/language/core/common/language_experiments.cc
@@ -31,11 +31,6 @@ const base::Feature kUseFluentLanguageModel {
 const base::Feature kNotifySyncOnLanguageDetermined{
     "NotifySyncOnLanguageDetermined", base::FEATURE_ENABLED_BY_DEFAULT};
 
-// Base feature for Translate desktop UI experiment
-// TODO(crbug.com/1054643): Clean up this flag and old UI code.
-const base::Feature kUseButtonTranslateBubbleUi{
-    "UseButtonTranslateBubbleUI", base::FEATURE_ENABLED_BY_DEFAULT};
-
 // Params:
 const char kBackoffThresholdKey[] = "backoff_threshold";
 const char kOverrideModelKey[] = "override_model";
@@ -100,11 +95,4 @@ bool IsForceTriggerBackoffThresholdReached(int force_trigger_count) {
   return force_trigger_count >= threshold;
 }
 
-TranslateUIBubbleModel GetTranslateUiBubbleModel() {
-  if (base::FeatureList::IsEnabled(language::kUseButtonTranslateBubbleUi)) {
-    return language::TranslateUIBubbleModel::TAB;
-  }
-  return language::TranslateUIBubbleModel::DEFAULT;
-}
-
 }  // namespace language
diff --git a/chromium/components/language/core/common/language_experiments.h b/chromium/components/language/core/common/language_experiments.h
index e2508dc3a8c..6332de11878 100644
--- a/chromium/components/language/core/common/language_experiments.h
+++ b/chromium/components/language/core/common/language_experiments.h
@@ -43,12 +43,6 @@ enum class OverrideLanguageModel {
   GEO,
 };
 
-// Options for the translate desktop UI experiment.
-enum class TranslateUIBubbleModel {
-  DEFAULT,
-  TAB,
-};
-
 // Returns which language model to use depending on the state of all Language
 // experiments.
 OverrideLanguageModel GetOverrideLanguageModel();
@@ -68,10 +62,6 @@ bool ShouldPreventRankerEnforcementInIndia(int force_trigger_count);
 // because of kOverrideTranslateTriggerInIndia often enough that the experiment
 // should stop being taken into account.
 bool IsForceTriggerBackoffThresholdReached(int force_trigger_count);
-
-// Returns which translate bubble UI to use depending on selection in
-// kTranslateUIBubbleKey.
-TranslateUIBubbleModel GetTranslateUiBubbleModel();
 }  // namespace language
 
 #endif  // COMPONENTS_LANGUAGE_CORE_COMMON_LANGUAGE_EXPERIMENTS_H_
diff --git a/chromium/components/language/core/common/locale_util_unittest.cc b/chromium/components/language/core/common/locale_util_unittest.cc
index 01a36cd8b67..506c02d2de2 100644
--- a/chromium/components/language/core/common/locale_util_unittest.cc
+++ b/chromium/components/language/core/common/locale_util_unittest.cc
@@ -217,18 +217,15 @@ TEST_F(LocaleUtilTest, ConvertToActualUILocale) {
   EXPECT_TRUE(is_ui);
   EXPECT_EQ("nb", locale);
 
-  //---------------------------------------------------------------------------
-  // Languages that have their base language is a UI language.
-  //---------------------------------------------------------------------------
   locale = "it-IT";
   is_ui = language::ConvertToActualUILocale(&locale);
   EXPECT_TRUE(is_ui);
-  EXPECT_EQ("it", locale);
+  EXPECT_EQ("it-IT", locale);
 
   locale = "de-DE";
   is_ui = language::ConvertToActualUILocale(&locale);
   EXPECT_TRUE(is_ui);
-  EXPECT_EQ("de", locale);
+  EXPECT_EQ("de-DE", locale);
 
 //---------------------------------------------------------------------------
 // Languages that cannot be used as display UI.