Rename HTTP bad-related flags to be more clear

components/security_state/security_state_model.cc

Index: components/security_state/security_state_model.cc
diff --git a/components/security_state/security_state_model.cc b/components/security_state/security_state_model.cc
index 50560e4e16eca4045df7abb52b4e313420b48f30..d532c120dac1984b00f100ec16cf8ba19a1a48d5 100644
--- a/components/security_state/security_state_model.cc
+++ b/components/security_state/security_state_model.cc
@@ -21,27 +21,27 @@ namespace {
 SecurityStateModel::SecurityLevel GetSecurityLevelForNonSecureFieldTrial() {
   std::string choice =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kMarkNonSecureAs);
+          switches::kMarkHttpAs);
   std::string group = base::FieldTrialList::FindFullName("MarkNonSecureAs");
 
   // Do not change this enum. It is used in the histogram.
-  enum MarkNonSecureStatus { NEUTRAL, DUBIOUS, NON_SECURE, LAST_STATUS };
+  enum MarkHttpStatus { NEUTRAL, DUBIOUS, NON_SECURE, LAST_STATUS };

[estark, 2016/09/22 23:53:53]

Just a heads-up, I think this will either conflict with or apply weirdly on top
of https://codereview.chromium.org/2350273002. So even if the rebase goes
through cleanly, you might want to just double-check that it doesn't come out as
something weird. (Like two enums, one named MarkHttpStatus and the other named
MarkHttpAsStatus, which is I think what I added.)

   const char kEnumeration[] = "MarkNonSecureAs";
 
   SecurityStateModel::SecurityLevel level = SecurityStateModel::NONE;
-  MarkNonSecureStatus status;
+  MarkHttpStatus status;
 
-  if (choice == switches::kMarkNonSecureAsNeutral) {
+  if (choice == switches::kMarkHttpAsNeutral) {
     status = NEUTRAL;
     level = SecurityStateModel::NONE;
-  } else if (choice == switches::kMarkNonSecureAsNonSecure) {
+  } else if (choice == switches::kMarkHttpAsNonSecure) {
     status = NON_SECURE;
     level = SecurityStateModel::SECURITY_ERROR;
-  } else if (group == switches::kMarkNonSecureAsNeutral ||
-             group == switches::kMarkNonSecureWithPasswordsOrCcAsNonSecure) {
+  } else if (group == switches::kMarkHttpAsNeutral ||
+             group == switches::kMarkHttpWithPasswordsOrCcWithChip) {
     status = NEUTRAL;
     level = SecurityStateModel::NONE;
-  } else if (group == switches::kMarkNonSecureAsNonSecure) {
+  } else if (group == switches::kMarkHttpAsNonSecure) {
     status = NON_SECURE;
     level = SecurityStateModel::SECURITY_ERROR;
   } else {