BASELINE: Update Chromium to 85.0.4183.14085-based

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

5 files changed, 9 insertions, 6 deletions

diff --git a/chromium/extensions/common/features/behavior_feature.cc b/chromium/extensions/common/features/behavior_feature.cc
index 3aa34f46376..472638b3bf7 100644
--- a/chromium/extensions/common/features/behavior_feature.cc
+++ b/chromium/extensions/common/features/behavior_feature.cc
@@ -22,6 +22,8 @@ const char kAllowDeprecatedAudioApi[] = "allow_deprecated_audio_api";
 const char kAllowSecondaryKioskAppEnabledOnLaunch[] =
     "allow_secondary_kiosk_app_enabled_on_launch";
 
+const char kKeyPermissionsInLoginScreen[] = "key_permissions_in_login_screen";
+
 }  // namespace behavior_feature
 
 }  // namespace extensions
diff --git a/chromium/extensions/common/features/behavior_feature.h b/chromium/extensions/common/features/behavior_feature.h
index 89ab9ebfbc0..150638888b2 100644
--- a/chromium/extensions/common/features/behavior_feature.h
+++ b/chromium/extensions/common/features/behavior_feature.h
@@ -17,6 +17,7 @@ extern const char kAllowUsbDevicesPermissionInterfaceClass[];
 extern const char kSigninScreen[];
 extern const char kAllowDeprecatedAudioApi[];
 extern const char kAllowSecondaryKioskAppEnabledOnLaunch[];
+extern const char kKeyPermissionsInLoginScreen[];
 
 }  // namespace behavior_feature
 
diff --git a/chromium/extensions/common/features/feature_flags.cc b/chromium/extensions/common/features/feature_flags.cc
index 5b63764e4c1..7efa308dbec 100644
--- a/chromium/extensions/common/features/feature_flags.cc
+++ b/chromium/extensions/common/features/feature_flags.cc
@@ -19,7 +19,7 @@ namespace {
 constexpr base::Feature kFeatureFlags[] = {
     {"DeclarativeNetRequest", base::FEATURE_ENABLED_BY_DEFAULT}};
 
-const std::vector<const base::Feature>* g_feature_flags_test_override = nullptr;
+const std::vector<base::Feature>* g_feature_flags_test_override = nullptr;
 
 template <typename T>
 const base::Feature* GetFeature(T begin,
@@ -52,8 +52,8 @@ bool IsFeatureFlagEnabled(const std::string& feature_flag) {
 }
 
 ScopedFeatureFlagsOverride CreateScopedFeatureFlagsOverrideForTesting(
-    const std::vector<const base::Feature>* features) {
-  return base::AutoReset<const std::vector<const base::Feature>*>(
+    const std::vector<base::Feature>* features) {
+  return base::AutoReset<const std::vector<base::Feature>*>(
       &g_feature_flags_test_override, features);
 }
 
diff --git a/chromium/extensions/common/features/feature_flags.h b/chromium/extensions/common/features/feature_flags.h
index d1a5dd3720b..b57740b25cf 100644
--- a/chromium/extensions/common/features/feature_flags.h
+++ b/chromium/extensions/common/features/feature_flags.h
@@ -25,9 +25,9 @@ bool IsFeatureFlagEnabled(const std::string& feature_flag);
 // in scope. Clients must ensure that |features| remains alive (non-dangling)
 // while the returned value is in scope.
 using ScopedFeatureFlagsOverride =
-    base::AutoReset<const std::vector<const base::Feature>*>;
+    base::AutoReset<const std::vector<base::Feature>*>;
 ScopedFeatureFlagsOverride CreateScopedFeatureFlagsOverrideForTesting(
-    const std::vector<const base::Feature>* features);
+    const std::vector<base::Feature>* features);
 
 }  // namespace extensions
 
diff --git a/chromium/extensions/common/features/simple_feature_unittest.cc b/chromium/extensions/common/features/simple_feature_unittest.cc
index 8d9e0ad3153..659d4ef7c90 100644
--- a/chromium/extensions/common/features/simple_feature_unittest.cc
+++ b/chromium/extensions/common/features/simple_feature_unittest.cc
@@ -718,7 +718,7 @@ TEST_F(SimpleFeatureTest, CommandLineSwitch) {
 }
 
 TEST_F(SimpleFeatureTest, FeatureFlags) {
-  const std::vector<const base::Feature> features(
+  const std::vector<base::Feature> features(
       {{"stub_feature_1", base::FEATURE_ENABLED_BY_DEFAULT},
        {"stub_feature_2", base::FEATURE_DISABLED_BY_DEFAULT}});
   auto scoped_feature_override =