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

components/security_state/core/security_state.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/security_state/core/security_state.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "components/security_state/core/switches.h"
 #include "net/ssl/ssl_cipher_suite_names.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 
 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
 };
 
 // If |switch_or_field_trial_group| corresponds to a valid
 // MarkHttpAs group, sets |*level| and |*histogram_status| to the
 // appropriate values and returns true. Otherwise, returns false.
 bool GetSecurityLevelAndHistogramValueForNonSecureFieldTrial(
     std::string switch_or_field_trial_group,
     bool displayed_sensitive_input_on_http,
     SecurityLevel* level,
@@ skipping 273 matching lines @@
           ran_content_with_cert_errors == other.ran_content_with_cert_errors &&
           pkp_bypassed == other.pkp_bypassed &&
           displayed_password_field_on_http ==
               other.displayed_password_field_on_http &&
           displayed_credit_card_field_on_http ==
               other.displayed_credit_card_field_on_http &&
           contained_mixed_form == other.contained_mixed_form);
 }
 
 }  // namespace security_state