Commit 2ec52ff9 authored by Stephan Hartmann's avatar Stephan Hartmann Committed by Commit Bot

libstdc++: std::vector must have non-const value_type

Bug: 957519
Change-Id: I535b3bcf318f98cecbf4be1520ffe4126abcacd8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2214556
Commit-Queue: Karan Bhatia <karandeepb@chromium.org>
Reviewed-by: default avatarKaran Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773855}
parent b31e13db
...@@ -19,7 +19,7 @@ namespace { ...@@ -19,7 +19,7 @@ namespace {
constexpr base::Feature kFeatureFlags[] = { constexpr base::Feature kFeatureFlags[] = {
{"DeclarativeNetRequest", base::FEATURE_ENABLED_BY_DEFAULT}}; {"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> template <typename T>
const base::Feature* GetFeature(T begin, const base::Feature* GetFeature(T begin,
...@@ -52,8 +52,8 @@ bool IsFeatureFlagEnabled(const std::string& feature_flag) { ...@@ -52,8 +52,8 @@ bool IsFeatureFlagEnabled(const std::string& feature_flag) {
} }
ScopedFeatureFlagsOverride CreateScopedFeatureFlagsOverrideForTesting( ScopedFeatureFlagsOverride CreateScopedFeatureFlagsOverrideForTesting(
const std::vector<const base::Feature>* features) { const std::vector<base::Feature>* features) {
return base::AutoReset<const std::vector<const base::Feature>*>( return base::AutoReset<const std::vector<base::Feature>*>(
&g_feature_flags_test_override, features); &g_feature_flags_test_override, features);
} }
......
...@@ -25,9 +25,9 @@ bool IsFeatureFlagEnabled(const std::string& feature_flag); ...@@ -25,9 +25,9 @@ bool IsFeatureFlagEnabled(const std::string& feature_flag);
// in scope. Clients must ensure that |features| remains alive (non-dangling) // in scope. Clients must ensure that |features| remains alive (non-dangling)
// while the returned value is in scope. // while the returned value is in scope.
using ScopedFeatureFlagsOverride = using ScopedFeatureFlagsOverride =
base::AutoReset<const std::vector<const base::Feature>*>; base::AutoReset<const std::vector<base::Feature>*>;
ScopedFeatureFlagsOverride CreateScopedFeatureFlagsOverrideForTesting( ScopedFeatureFlagsOverride CreateScopedFeatureFlagsOverrideForTesting(
const std::vector<const base::Feature>* features); const std::vector<base::Feature>* features);
} // namespace extensions } // namespace extensions
......
...@@ -718,7 +718,7 @@ TEST_F(SimpleFeatureTest, CommandLineSwitch) { ...@@ -718,7 +718,7 @@ TEST_F(SimpleFeatureTest, CommandLineSwitch) {
} }
TEST_F(SimpleFeatureTest, FeatureFlags) { 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_1", base::FEATURE_ENABLED_BY_DEFAULT},
{"stub_feature_2", base::FEATURE_DISABLED_BY_DEFAULT}}); {"stub_feature_2", base::FEATURE_DISABLED_BY_DEFAULT}});
auto scoped_feature_override = auto scoped_feature_override =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment