Adjust HTTP-bad console messages

chrome/browser/ssl/chrome_security_state_model_client.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 "chrome/browser/ssl/chrome_security_state_model_client.h"
 
 #include <openssl/ssl.h>
 
 #include <vector>
 
@@ skipping 316 matching lines @@
     SecurityStateModel::SecurityInfo* result) const {
   security_state_model_->GetSecurityInfo(result);
 }
 
 void ChromeSecurityStateModelClient::VisibleSSLStateChanged() {
   if (logged_http_warning_on_current_navigation_)
     return;
 
   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;
   }
 }
 
 void ChromeSecurityStateModelClient::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   if (navigation_handle->IsInMainFrame() &&
       !navigation_handle->IsSynchronousNavigation()) {
     // Only reset the console message flag for main-frame navigations,
     // and not for synchronous navigations like reference fragments and
@@ skipping 58 matching lines @@
       !!(ssl.content_status & content::SSLStatus::RAN_CONTENT_WITH_CERT_ERRORS);
   state->displayed_password_field_on_http =
       !!(ssl.content_status &
          content::SSLStatus::DISPLAYED_PASSWORD_FIELD_ON_HTTP);
   state->displayed_credit_card_field_on_http =
       !!(ssl.content_status &
          content::SSLStatus::DISPLAYED_CREDIT_CARD_FIELD_ON_HTTP);
 
   CheckSafeBrowsingStatus(entry, web_contents_, state);
 }