Move HTTP-Bad to Feature API and implement new options
This CL moves the HTTP-Bad from outdated field trial groups to the Feature API
with parameters to control the UI treatment. It adds three new UI treatments for
nonsecure pages:
- mark all nonsecure pages as Not Secure
- mark all nonsecure pages as Not Secure and treat them as actively dangerous when
a form field is edited
- mark all nonsecure pages as Not Secure and treat them as actively dangerous for
passwords and credit card fields
This doesn't implement any DevTools or Page Info changes for these configurations.
Bug: 797437,740395
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I646502a05967b63d3c34015d0d597ce5382248f9
Reviewed-on: https://chromium-review.googlesource.com/843456
Reviewed-by: Eugene But <[email protected]>
Reviewed-by: Jesse Doherty <[email protected]>
Reviewed-by: Eric Lawrence <[email protected]>
Commit-Queue: Emily Stark <[email protected]>
Cr-Commit-Position: refs/heads/master@{#526857}diff --git a/ios/chrome/browser/about_flags.mm b/ios/chrome/browser/about_flags.mm
index 8dbd00e9..173c434d 100644
--- a/ios/chrome/browser/about_flags.mm
+++ b/ios/chrome/browser/about_flags.mm
@@ -33,7 +33,7 @@
#include "components/password_manager/core/common/password_manager_features.h"
#include "components/payments/core/features.h"
#include "components/search_provider_logos/switches.h"
-#include "components/security_state/core/switches.h"
+#include "components/security_state/core/features.h"
#include "components/signin/core/browser/signin_switches.h"
#include "components/strings/grit/components_strings.h"
#include "ios/chrome/browser/bookmarks/bookmark_new_generation_features.h"
@@ -66,11 +66,36 @@
using flags_ui::FeatureEntry;
namespace {
-const FeatureEntry::Choice kMarkHttpAsChoices[] = {
- {flags_ui::kGenericExperimentChoiceDefault, "", ""},
- {flag_descriptions::kMarkHttpAsDangerous,
- security_state::switches::kMarkHttpAs,
- security_state::switches::kMarkHttpAsDangerous}};
+
+const FeatureEntry::FeatureParam kMarkHttpAsDangerous[] = {
+ {security_state::features::kMarkHttpAsFeatureParameterName,
+ security_state::features::kMarkHttpAsParameterDangerous}};
+const FeatureEntry::FeatureParam kMarkHttpAsWarning[] = {
+ {security_state::features::kMarkHttpAsFeatureParameterName,
+ security_state::features::kMarkHttpAsParameterWarning}};
+const FeatureEntry::FeatureParam kMarkHttpAsWarningAndDangerousOnFormEdits[] = {
+ {security_state::features::kMarkHttpAsFeatureParameterName,
+ security_state::features::
+ kMarkHttpAsParameterWarningAndDangerousOnFormEdits}};
+const FeatureEntry::FeatureParam
+ kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[] = {
+ {security_state::features::kMarkHttpAsFeatureParameterName,
+ security_state::features::
+ kMarkHttpAsParameterWarningAndDangerousOnPasswordsAndCreditCards}};
+
+const FeatureEntry::FeatureVariation kMarkHttpAsFeatureVariations[] = {
+ {"(mark as actively dangerous)", kMarkHttpAsDangerous,
+ arraysize(kMarkHttpAsDangerous), nullptr},
+ {"(mark with a Not Secure warning)", kMarkHttpAsWarning,
+ arraysize(kMarkHttpAsWarning), nullptr},
+ {"(mark with a Not Secure warning and dangerous on form edits)",
+ kMarkHttpAsWarningAndDangerousOnFormEdits,
+ arraysize(kMarkHttpAsWarningAndDangerousOnFormEdits), nullptr},
+ {"(mark with a Not Secure warning and dangerous on passwords and credit "
+ "card fields)",
+ kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards,
+ arraysize(kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards),
+ nullptr}};
const FeatureEntry::Choice kUseDdljsonApiChoices[] = {
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
@@ -110,9 +135,12 @@
//
// When adding a new choice, add it to the end of the list.
const flags_ui::FeatureEntry kFeatureEntries[] = {
- {"mark-non-secure-as", flag_descriptions::kMarkHttpAsName,
+ {"enable-mark-http-as", flag_descriptions::kMarkHttpAsName,
flag_descriptions::kMarkHttpAsDescription, flags_ui::kOsIos,
- MULTI_VALUE_TYPE(kMarkHttpAsChoices)},
+ FEATURE_WITH_PARAMS_VALUE_TYPE(
+ security_state::features::kMarkHttpAsFeature,
+ kMarkHttpAsFeatureVariations,
+ "MarkHttpAs")},
{"web-payments", flag_descriptions::kWebPaymentsName,
flag_descriptions::kWebPaymentsDescription, flags_ui::kOsIos,
FEATURE_VALUE_TYPE(payments::features::kWebPayments)},
