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

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

Issue 2838193002: Split the ScopedSubresourceFilterFeatureToggle into two helper classes. (Closed)
Patch Set: Rebase. Created 3 years, 8 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
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 5e43f17dd69cede72da0465e2a4ed30d97640408..d1cf6a51efacb67bc36f8cbfce3d62d9d1b0afe6 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
@@ -4,80 +4,47 @@
#include "components/subresource_filter/core/browser/subresource_filter_features_test_support.h"
-#include <map>
-#include <memory>
+#include <utility>
-#include "base/metrics/field_trial.h"
-#include "base/metrics/field_trial_params.h"
-#include "components/subresource_filter/core/browser/subresource_filter_features.h"
-#include "components/variations/variations_associated_data.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "base/memory/ptr_util.h"
+#include "base/memory/ref_counted.h"
+#include "base/strings/string_util.h"
namespace subresource_filter {
namespace testing {
-namespace {
-constexpr const char kTestFieldTrialName[] = "FieldTrialNameShouldNotMatter";
-constexpr const char kTestExperimentGroupName[] = "GroupNameShouldNotMatter";
-} // namespace
+// ScopedSubresourceFilterConfigurator ----------------------------------------
-ScopedSubresourceFilterFeatureToggle::ScopedSubresourceFilterFeatureToggle(
- base::FeatureList::OverrideState feature_state,
- const std::string& maximum_activation_level,
- const std::string& activation_scope,
- const std::string& activation_lists,
- const std::string& performance_measurement_rate,
- const std::string& suppress_notifications,
- const std::string& whitelist_site_on_reload)
- : ScopedSubresourceFilterFeatureToggle(
- feature_state,
- {{kActivationLevelParameterName, maximum_activation_level},
- {kActivationScopeParameterName, activation_scope},
- {kActivationListsParameterName, activation_lists},
- {kPerformanceMeasurementRateParameterName,
- performance_measurement_rate},
- {kSuppressNotificationsParameterName, suppress_notifications},
- {kWhitelistSiteOnReloadParameterName, whitelist_site_on_reload}}) {}
-
-ScopedSubresourceFilterFeatureToggle::ScopedSubresourceFilterFeatureToggle(
- base::FeatureList::OverrideState feature_state,
- std::map<std::string, std::string> variation_params) {
- EXPECT_TRUE(base::AssociateFieldTrialParams(
- kTestFieldTrialName, kTestExperimentGroupName, variation_params));
-
- base::FieldTrial* field_trial = base::FieldTrialList::CreateFieldTrial(
- kTestFieldTrialName, kTestExperimentGroupName);
+ScopedSubresourceFilterConfigurator::ScopedSubresourceFilterConfigurator(
+ scoped_refptr<ConfigurationList> configs)
+ : original_config_(GetAndSetActivateConfigurations(configs)) {}
- std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
- feature_list->RegisterFieldTrialOverride(kSafeBrowsingSubresourceFilter.name,
- feature_state, field_trial);
+ScopedSubresourceFilterConfigurator::ScopedSubresourceFilterConfigurator(
+ Configuration config)
+ : ScopedSubresourceFilterConfigurator(
+ base::MakeShared<ConfigurationList>(std::move(config))) {}
- // 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));
+ScopedSubresourceFilterConfigurator::~ScopedSubresourceFilterConfigurator() {
+ GetAndSetActivateConfigurations(std::move(original_config_));
+}
- // Force the active ConfigurationList to be reparsed on next access so that
- // the variation parameters come into effect.
- ClearCachedActiveConfigurations();
+void ScopedSubresourceFilterConfigurator::ResetConfiguration(
+ Configuration config) {
+ GetAndSetActivateConfigurations(
+ base::MakeShared<ConfigurationList>(std::move(config)));
}
-ScopedSubresourceFilterFeatureToggle::~ScopedSubresourceFilterFeatureToggle() {
- variations::testing::ClearAllVariationParams();
+// ScopedSubresourceFilterFeatureToggle ---------------------------------------
- // Force the active ConfigurationList to be reparsed on next access, so that
- // the overrides from this instance are no longer in effect.
- ClearCachedActiveConfigurations();
+ScopedSubresourceFilterFeatureToggle::ScopedSubresourceFilterFeatureToggle(
+ base::FeatureList::OverrideState feature_state) {
+ if (feature_state == base::FeatureList::OVERRIDE_ENABLE_FEATURE)
+ scoped_feature_list_.InitAndEnableFeature(kSafeBrowsingSubresourceFilter);
+ else if (feature_state == base::FeatureList::OVERRIDE_DISABLE_FEATURE)
+ scoped_feature_list_.InitAndDisableFeature(kSafeBrowsingSubresourceFilter);
}
+ScopedSubresourceFilterFeatureToggle::~ScopedSubresourceFilterFeatureToggle() {}
+
} // namespace testing
} // namespace subresource_filter

Powered by Google App Engine
This is Rietveld 408576698