Enable SimplifyHttpsIndicator feature by default
This also cleans up the various old conditions, keeping the feature
flag as a simple binary flag (enabled = lock-only). Also updates tests
and removes the console warning and testing config.
Bug: 803138
Change-Id: Ibb6a4679488f7afb2bc3f32bed2f9e44e2aa963e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1643931
Reviewed-by: Mustafa Emre Acer <[email protected]>
Reviewed-by: Jesse Doherty <[email protected]>
Reviewed-by: Tommy Li <[email protected]>
Commit-Queue: Christopher Thompson <[email protected]>
Cr-Commit-Position: refs/heads/master@{#666975}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index d09193d..e12102d 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -846,31 +846,6 @@
kMarkHttpAsWarningAndDangerousOnFormEdits,
base::size(kMarkHttpAsWarningAndDangerousOnFormEdits), nullptr}};
-const FeatureEntry::FeatureParam kSimplifyHttpsIndicatorEvToSecure[] = {
- {OmniboxFieldTrial::kSimplifyHttpsIndicatorParameterName,
- OmniboxFieldTrial::kSimplifyHttpsIndicatorParameterEvToSecure}};
-const FeatureEntry::FeatureParam kSimplifyHttpsIndicatorSecureToLock[] = {
- {OmniboxFieldTrial::kSimplifyHttpsIndicatorParameterName,
- OmniboxFieldTrial::kSimplifyHttpsIndicatorParameterSecureToLock}};
-const FeatureEntry::FeatureParam kSimplifyHttpsIndicatorBothToLock[] = {
- {OmniboxFieldTrial::kSimplifyHttpsIndicatorParameterName,
- OmniboxFieldTrial::kSimplifyHttpsIndicatorParameterBothToLock}};
-const FeatureEntry::FeatureParam kSimplifyHttpsIndicatorKeepSecureChip[] = {
- {OmniboxFieldTrial::kSimplifyHttpsIndicatorParameterName,
- OmniboxFieldTrial::kSimplifyHttpsIndicatorParameterKeepSecureChip}};
-
-const FeatureEntry::FeatureVariation kSimplifyHttpsIndicatorVariations[] = {
- {"(show Secure chip for EV pages)", kSimplifyHttpsIndicatorEvToSecure,
- base::size(kSimplifyHttpsIndicatorEvToSecure), nullptr},
- {"(show Lock icon for non-EV HTTPS pages)",
- kSimplifyHttpsIndicatorSecureToLock,
- base::size(kSimplifyHttpsIndicatorSecureToLock), nullptr},
- {"(show Lock icon for all HTTPS pages)", kSimplifyHttpsIndicatorBothToLock,
- base::size(kSimplifyHttpsIndicatorBothToLock), nullptr},
- {"(show Secure chip for non-EV HTTPS pages)",
- kSimplifyHttpsIndicatorKeepSecureChip,
- base::size(kSimplifyHttpsIndicatorKeepSecureChip), nullptr}};
-
#if defined(OS_ANDROID)
const FeatureEntry::FeatureParam kTranslateForceTriggerOnEnglishHeuristic[] = {
{language::kOverrideModelKey, language::kOverrideModelHeuristicValue},
@@ -2886,9 +2861,7 @@
{"simplify-https-indicator", flag_descriptions::kSimplifyHttpsIndicatorName,
flag_descriptions::kSimplifyHttpsIndicatorDescription, kOsDesktop,
- FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kSimplifyHttpsIndicator,
- kSimplifyHttpsIndicatorVariations,
- "SimplifyHttpsIndicator")},
+ FEATURE_VALUE_TYPE(omnibox::kSimplifyHttpsIndicator)},
#if defined(OS_WIN)
{"enable-gpu-appcontainer", flag_descriptions::kEnableGpuAppcontainerName,
