Reland of Trigger Dangerous indicator for unsafe subresources

chrome/browser/ssl/chrome_security_state_model_client_browser_tests.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 "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 1214 matching lines @@
   ASSERT_TRUE(client);
   security_state::SecurityStateModel::SecurityInfo security_info;
   client->GetSecurityInfo(&security_info);
   EXPECT_EQ(security_state::SecurityStateModel::HTTP_SHOW_WARNING,
             security_info.security_level);
 
   // Check that the expected console message is present.
   ASSERT_NO_FATAL_FAILURE(CheckForOneHttpWarningConsoleMessage(delegate));
   delegate->ClearConsoleMessages();
 
-  // Two subsequent triggers of VisibleSSLStateChanged -- one on the
+  // Two subsequent triggers of VisibleSecurityStateChanged -- one on the
   // same navigation and one on another navigation -- should only result
   // in one additional console message.
   contents->OnCreditCardInputShownOnHttp();
   GURL second_http_url =
       GetURLWithNonLocalHostname(embedded_test_server(), "/title2.html");
   ui_test_utils::NavigateToURL(delegate, second_http_url);
   entry = contents->GetController().GetVisibleEntry();
   ASSERT_TRUE(entry);
   EXPECT_EQ(second_http_url, entry->GetURL());
 
@@ skipping 52 matching lines @@
   security_state::SecurityStateModel::SecurityInfo security_info;
   client->GetSecurityInfo(&security_info);
   EXPECT_EQ(security_state::SecurityStateModel::NONE,
             security_info.security_level);
   EXPECT_TRUE(security_info.displayed_private_user_data_input_on_http);
 
   // Check that the expected console message is present.
   ASSERT_NO_FATAL_FAILURE(CheckForOneFutureHttpWarningConsoleMessage(delegate));
   delegate->ClearConsoleMessages();
 
-  // Two subsequent triggers of VisibleSSLStateChanged -- one on the
+  // Two subsequent triggers of VisibleSecurityStateChanged -- one on the
   // same navigation and one on another navigation -- should only result
   // in one additional console message.
   contents->OnCreditCardInputShownOnHttp();
   GURL second_http_url =
       GetURLWithNonLocalHostname(embedded_test_server(), "/title2.html");
   ui_test_utils::NavigateToURL(delegate, second_http_url);
   entry = contents->GetController().GetVisibleEntry();
   ASSERT_TRUE(entry);
   EXPECT_EQ(second_http_url, entry->GetURL());
 
@@ skipping 50 matching lines @@
   ASSERT_TRUE(client);
   security_state::SecurityStateModel::SecurityInfo security_info;
   client->GetSecurityInfo(&security_info);
   EXPECT_EQ(security_state::SecurityStateModel::HTTP_SHOW_WARNING,
             security_info.security_level);
 
   // Check that the expected console message is present.
   ASSERT_NO_FATAL_FAILURE(CheckForOneHttpWarningConsoleMessage(delegate));
   delegate->ClearConsoleMessages();
 
-  // Navigate the subframe and trigger VisibleSSLStateChanged
+  // Navigate the subframe and trigger VisibleSecurityStateChanged
   // again. While the security level is still HTTP_SHOW_WARNING, an
   // additional console message should not be logged because there was
   // already a console message logged for the current main-frame
   // navigation.
   content::WindowedNotificationObserver subframe_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<content::NavigationController>(
           &contents->GetController()));
   EXPECT_TRUE(content::ExecuteScript(
       contents, "document.getElementById('navFrame').src = '/title2.html';"));
@@ skipping 63 matching lines @@
   ASSERT_TRUE(client);
   security_state::SecurityStateModel::SecurityInfo security_info;
   client->GetSecurityInfo(&security_info);
   EXPECT_EQ(security_state::SecurityStateModel::HTTP_SHOW_WARNING,
             security_info.security_level);
 
   // Check that the expected console message is present.
   ASSERT_NO_FATAL_FAILURE(CheckForOneHttpWarningConsoleMessage(delegate));
   delegate->ClearConsoleMessages();
 
-  // Navigate with pushState and trigger VisibleSSLStateChanged
+  // Navigate with pushState and trigger VisibleSecurityStateChanged
   // again. While the security level is still HTTP_SHOW_WARNING, an
   // additional console message should not be logged because there was
   // already a console message logged for the current main-frame
   // navigation.
   EXPECT_TRUE(content::ExecuteScript(
       contents, "history.pushState({ foo: 'bar' }, 'foo', 'bar');"));
   contents->OnCreditCardInputShownOnHttp();
   EXPECT_EQ(security_state::SecurityStateModel::HTTP_SHOW_WARNING,
             security_info.security_level);
 
@@ skipping 568 matching lines @@
   ChromeSecurityStateModelClient* model_client =
       ChromeSecurityStateModelClient::FromWebContents(web_contents);
   ASSERT_TRUE(model_client);
   SecurityStateModel::SecurityInfo security_info;
   model_client->GetSecurityInfo(&security_info);
   EXPECT_EQ(SecurityStateModel::SECURE, security_info.security_level);
   EXPECT_EQ(kTestSCTStatuses, security_info.sct_verify_statuses);
 }
 
 }  // namespace