Rename HTTP bad-related flags to be more clear

components/security_state/security_state_model_unittest.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 "components/security_state/security_state_model_client.h"
@@ skipping 236 matching lines @@
   SecurityStateModel::SecurityInfo security_info;
   model.GetSecurityInfo(&security_info);
   EXPECT_TRUE(security_info.fails_malware_check);
   EXPECT_EQ(SecurityStateModel::SECURITY_ERROR, security_info.security_level);
 }
 
 // Tests that password fields cause the security level to be downgraded
 // to HTTP_SHOW_WARNING when the command-line switch is set.
 TEST(SecurityStateModelTest, PasswordFieldWarning) {
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kMarkNonSecureAs,
-      switches::kMarkNonSecureWithPasswordsOrCcAsNonSecure);
+      switches::kMarkHttpAs,
+      switches::kMarkHttpWithPasswordsOrCcWithChip);
   TestSecurityStateModelClient client;
   client.UseHttpUrl();
   client.set_initial_security_level(SecurityStateModel::NONE);
   SecurityStateModel model;
   model.SetClient(&client);
   client.set_displayed_password_field_on_http(true);
   SecurityStateModel::SecurityInfo security_info;
   model.GetSecurityInfo(&security_info);
   EXPECT_EQ(SecurityStateModel::HTTP_SHOW_WARNING,
             security_info.security_level);
 }
 
 // Tests that credit card fields cause the security level to be downgraded
 // to HTTP_SHOW_WARNING when the command-line switch is set.
 TEST(SecurityStateModelTest, CreditCardFieldWarning) {
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kMarkNonSecureAs,
-      switches::kMarkNonSecureWithPasswordsOrCcAsNonSecure);
+      switches::kMarkHttpAs,
+      switches::kMarkHttpWithPasswordsOrCcWithChip);
   TestSecurityStateModelClient client;
   client.UseHttpUrl();
   client.set_initial_security_level(SecurityStateModel::NONE);
   SecurityStateModel model;
   model.SetClient(&client);
   client.set_displayed_credit_card_field_on_http(true);
   SecurityStateModel::SecurityInfo security_info;
   model.GetSecurityInfo(&security_info);
   EXPECT_EQ(SecurityStateModel::HTTP_SHOW_WARNING,
             security_info.security_level);
@@ skipping 11 matching lines @@
   client.set_displayed_password_field_on_http(true);
   client.set_displayed_credit_card_field_on_http(true);
   SecurityStateModel::SecurityInfo security_info;
   model.GetSecurityInfo(&security_info);
   EXPECT_EQ(SecurityStateModel::NONE, security_info.security_level);
 }
 
 }  // namespace
 
 }  // namespace security_state