Adjust HTTP-bad console messages

chrome/browser/ssl/chrome_security_state_model_client.cc

Index: chrome/browser/ssl/chrome_security_state_model_client.cc
diff --git a/chrome/browser/ssl/chrome_security_state_model_client.cc b/chrome/browser/ssl/chrome_security_state_model_client.cc
index 0a2c80e27980fea3438838515c75000043be03c5..4834da9da9eea4e78654a8ceee21f8c51537c9a5 100644
--- a/chrome/browser/ssl/chrome_security_state_model_client.cc
+++ b/chrome/browser/ssl/chrome_security_state_model_client.cc
@@ -334,13 +334,26 @@ void ChromeSecurityStateModelClient::VisibleSSLStateChanged() {
 
   security_state::SecurityStateModel::SecurityInfo security_info;
   GetSecurityInfo(&security_info);
+  if (!security_info.displayed_private_user_data_input_on_http)
+    return;
+
   if (security_info.security_level ==
       security_state::SecurityStateModel::HTTP_SHOW_WARNING) {
     web_contents_->GetMainFrame()->AddMessageToConsole(
         content::CONSOLE_MESSAGE_LEVEL_WARNING,
-        "In Chrome M56 (Jan 2017), this page will be marked "
-        "as \"not secure\" in the URL bar. For more "
-        "information, see https://goo.gl/zmWq3m");
+        "This page includes a password or credit card input in a non-secure "
+        "context. A warning has been added to the URL bar. For more "
+        "information, see "
+        "https://goo.gl/zmWq3m.");
+    logged_http_warning_on_current_navigation_ = true;
+  } else if (security_info.security_level ==
+             security_state::SecurityStateModel::NONE) {
+    web_contents_->GetMainFrame()->AddMessageToConsole(
+        content::CONSOLE_MESSAGE_LEVEL_WARNING,
+        "This page includes a password or credit card input in a non-secure "
+        "context. A warning will be added to the URL bar in Chrome 56 (Jan "
+        "2017). For "
+        "more information, see https://goo.gl/zmWq3m.");

[elawrence, 2016/10/20 18:56:13]

Is this more clear, or less?

string sWarning;

switch (security_info.security_level) {
  case security_state::SecurityStateModel::NONE:
    sWarning = ".... will be added...";
  break;
  case security_state::SecurityStateModel::HTTP_SHOW_WARNING:
    sWarning = "... has been added...";
  break;
  default:
     return;
}

web_contents_->GetMainFrame()->AddMessageToConsole(
  content::CONSOLE_MESSAGE_LEVEL_WARNING,
  sWarning);
logged_http_warning_on_current_navigation_ = true;

[estark, 2016/10/20 21:18:14]

Done.

     logged_http_warning_on_current_navigation_ = true;
   }
 }