diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/extensions/common/features/feature_flags.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/extensions/common/features/feature_flags.cc')
| -rw-r--r-- | chromium/extensions/common/features/feature_flags.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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); } |