Add new mark-non-secure-as options to chrome://flags

components/security_state/core/security_state.cc

Index: components/security_state/core/security_state.cc
diff --git a/components/security_state/core/security_state.cc b/components/security_state/core/security_state.cc
index aed4e42d2bfd73eea7accb8bd632d780326bb5f8..cfbcd008c1df9d21f91897da15c910a71d66128e 100644
--- a/components/security_state/core/security_state.cc
+++ b/components/security_state/core/security_state.cc
@@ -17,12 +17,15 @@ namespace security_state {
 
 namespace {
 
-// Do not change or reorder this enum, and add new values at the end. It is used
-// in the MarkHttpAs histogram.
+// These values are written to logs. New enum values can be added, but existing

[elawrence, 2017/05/30 20:18:14]

Updated comment and made numbering explicit per
https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histo...

[estark, 2017/05/30 22:46:42]

Thanks!

+// enums must never be renumbered or deleted and reused.
 enum MarkHttpStatus {
-  NEUTRAL /* deprecated */,
-  NON_SECURE,
-  HTTP_SHOW_WARNING_ON_SENSITIVE_FIELDS,
+  NEUTRAL = 0,  // Deprecated
+  NON_SECURE = 1,
+  HTTP_SHOW_WARNING_ON_SENSITIVE_FIELDS = 2,
+  NON_SECURE_WHILE_EDITING = 3,
+  NON_SECURE_WHILE_INCOGNITO = 4,
+  NON_SECURE_WHILE_INCOGNITO_OR_EDITING = 5,
   LAST_STATUS
 };