Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: components/subresource_filter/core/browser/subresource_filter_features_test_support.cc

Issue 2362383002: Subresource Filter: Fix browsertest to preserve feature flags (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/subresource_filter/core/browser/subresource_filter_features_test_support.cc
diff --git a/components/subresource_filter/core/browser/subresource_filter_features_test_support.cc b/components/subresource_filter/core/browser/subresource_filter_features_test_support.cc
index 38cd2185eedb24601c9f80e77a43af057b7c26a0..5396c019832021cebb54721bcf60fcb1c65828cb 100644
--- a/components/subresource_filter/core/browser/subresource_filter_features_test_support.cc
+++ b/components/subresource_filter/core/browser/subresource_filter_features_test_support.cc
@@ -49,6 +49,19 @@ ScopedSubresourceFilterFeatureToggle::ScopedSubresourceFilterFeatureToggle(
std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
feature_list->RegisterFieldTrialOverride(kSafeBrowsingSubresourceFilter.name,
feature_state, field_trial);
+
+ // Since we are adding a scoped feature list after browser start, copy over
+ // the existing feature list to prevent inconsistency.
+ base::FeatureList* existing_feature_list = base::FeatureList::GetInstance();
+ if (existing_feature_list) {
+ std::string enabled_features;
+ std::string disabled_features;
+ base::FeatureList::GetInstance()->GetFeatureOverrides(&enabled_features,
+ &disabled_features);
+ feature_list->InitializeFromCommandLine(enabled_features,
+ disabled_features);
+ }
+
scoped_feature_list_.InitWithFeatureList(std::move(feature_list));
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698