Rename HTTP bad-related flags to be more clear

components/security_state/security_state_model.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/security_state_model.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/security_state_model_client.h"
 #include "components/security_state/switches.h"
 #include "net/ssl/ssl_cipher_suite_names.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 
 namespace security_state {
 
 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 {
     status = NEUTRAL;
     level = SecurityStateModel::NONE;
   }
 
   UMA_HISTOGRAM_ENUMERATION(kEnumeration, status, LAST_STATUS);
   return level;
 }
@@ skipping 260 matching lines @@
           sct_verify_statuses == other.sct_verify_statuses &&
           displayed_mixed_content == other.displayed_mixed_content &&
           ran_mixed_content == other.ran_mixed_content &&
           displayed_content_with_cert_errors ==
               other.displayed_content_with_cert_errors &&
           ran_content_with_cert_errors == other.ran_content_with_cert_errors &&
           pkp_bypassed == other.pkp_bypassed);
 }
 
 }  // namespace security_state