Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6535)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc

Issue 2286553002: DevTools security panel: explain subresources with cert errors separately (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: try to make comment more clear Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ssl/chrome_security_state_model_client.cc ('k') | chrome/browser/ssl/chrome_security_state_model_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc
diff --git a/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc b/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc
index e7c25a71c9fee762ae797a29b008fb0b80bc054d..16508c07c1050fb7118b46f87e8db4f20520b59e 100644
--- a/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc
+++ b/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc
@@ -918,8 +918,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStyleChangedTest, SecurityStyleChangedObserver) {
EXPECT_FALSE(observer.latest_explanations().scheme_is_cryptographic);
EXPECT_FALSE(observer.latest_explanations().pkp_bypassed);
EXPECT_TRUE(observer.latest_explanations().info_explanations.empty());
- EXPECT_FALSE(observer.latest_explanations().ran_insecure_content);
- EXPECT_FALSE(observer.latest_explanations().displayed_insecure_content);
+ EXPECT_FALSE(observer.latest_explanations().ran_mixed_content);
+ EXPECT_FALSE(observer.latest_explanations().displayed_mixed_content);
// Visit an (otherwise valid) HTTPS page that displays mixed content.
std::string replacement_path;
@@ -941,8 +941,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStyleChangedTest, SecurityStyleChangedObserver) {
EXPECT_TRUE(mixed_content_explanation.scheme_is_cryptographic);
EXPECT_FALSE(observer.latest_explanations().pkp_bypassed);
EXPECT_TRUE(observer.latest_explanations().info_explanations.empty());
- EXPECT_TRUE(mixed_content_explanation.displayed_insecure_content);
- EXPECT_FALSE(mixed_content_explanation.ran_insecure_content);
+ EXPECT_TRUE(mixed_content_explanation.displayed_mixed_content);
+ EXPECT_FALSE(mixed_content_explanation.ran_mixed_content);
EXPECT_EQ(content::SECURITY_STYLE_UNAUTHENTICATED,
mixed_content_explanation.displayed_insecure_content_style);
EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATION_BROKEN,
@@ -962,8 +962,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStyleChangedTest, SecurityStyleChangedObserver) {
EXPECT_TRUE(observer.latest_explanations().scheme_is_cryptographic);
EXPECT_FALSE(observer.latest_explanations().pkp_bypassed);
EXPECT_TRUE(observer.latest_explanations().info_explanations.empty());
- EXPECT_FALSE(observer.latest_explanations().displayed_insecure_content);
- EXPECT_FALSE(observer.latest_explanations().ran_insecure_content);
+ EXPECT_FALSE(observer.latest_explanations().displayed_mixed_content);
+ EXPECT_FALSE(observer.latest_explanations().ran_mixed_content);
// Before clicking through, navigate to a different page, and then go
// back to the interstitial.
@@ -979,8 +979,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStyleChangedTest, SecurityStyleChangedObserver) {
EXPECT_TRUE(observer.latest_explanations().scheme_is_cryptographic);
EXPECT_FALSE(observer.latest_explanations().pkp_bypassed);
EXPECT_TRUE(observer.latest_explanations().info_explanations.empty());
- EXPECT_FALSE(observer.latest_explanations().displayed_insecure_content);
- EXPECT_FALSE(observer.latest_explanations().ran_insecure_content);
+ EXPECT_FALSE(observer.latest_explanations().displayed_mixed_content);
+ EXPECT_FALSE(observer.latest_explanations().ran_mixed_content);
// After going back to the interstitial, an event for a broken lock
// icon should fire again.
@@ -993,8 +993,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStyleChangedTest, SecurityStyleChangedObserver) {
EXPECT_TRUE(observer.latest_explanations().scheme_is_cryptographic);
EXPECT_FALSE(observer.latest_explanations().pkp_bypassed);
EXPECT_TRUE(observer.latest_explanations().info_explanations.empty());
- EXPECT_FALSE(observer.latest_explanations().displayed_insecure_content);
- EXPECT_FALSE(observer.latest_explanations().ran_insecure_content);
+ EXPECT_FALSE(observer.latest_explanations().displayed_mixed_content);
+ EXPECT_FALSE(observer.latest_explanations().ran_mixed_content);
// Since the next expected style is the same as the previous, clear
// the observer (to make sure that the event fires twice and we don't
@@ -1011,8 +1011,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStyleChangedTest, SecurityStyleChangedObserver) {
EXPECT_TRUE(observer.latest_explanations().scheme_is_cryptographic);
EXPECT_FALSE(observer.latest_explanations().pkp_bypassed);
EXPECT_TRUE(observer.latest_explanations().info_explanations.empty());
- EXPECT_FALSE(observer.latest_explanations().displayed_insecure_content);
- EXPECT_FALSE(observer.latest_explanations().ran_insecure_content);
+ EXPECT_FALSE(observer.latest_explanations().displayed_mixed_content);
+ EXPECT_FALSE(observer.latest_explanations().ran_mixed_content);
}
// Visit a valid HTTPS page, then a broken HTTPS page, and then go back,
@@ -1053,8 +1053,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStyleChangedTest,
EXPECT_TRUE(observer.latest_explanations().scheme_is_cryptographic);
EXPECT_FALSE(observer.latest_explanations().pkp_bypassed);
EXPECT_TRUE(observer.latest_explanations().info_explanations.empty());
- EXPECT_FALSE(observer.latest_explanations().displayed_insecure_content);
- EXPECT_FALSE(observer.latest_explanations().ran_insecure_content);
+ EXPECT_FALSE(observer.latest_explanations().displayed_mixed_content);
+ EXPECT_FALSE(observer.latest_explanations().ran_mixed_content);
// Navigate to a bad HTTPS page on a different host, and then click
// Back to verify that the previous good security style is seen again.
@@ -1079,8 +1079,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStyleChangedTest,
EXPECT_TRUE(observer.latest_explanations().scheme_is_cryptographic);
EXPECT_FALSE(observer.latest_explanations().pkp_bypassed);
EXPECT_TRUE(observer.latest_explanations().info_explanations.empty());
- EXPECT_FALSE(observer.latest_explanations().displayed_insecure_content);
- EXPECT_FALSE(observer.latest_explanations().ran_insecure_content);
+ EXPECT_FALSE(observer.latest_explanations().displayed_mixed_content);
+ EXPECT_FALSE(observer.latest_explanations().ran_mixed_content);
content::WindowedNotificationObserver back_nav_load_observer(
content::NOTIFICATION_LOAD_STOP,
@@ -1099,8 +1099,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStyleChangedTest,
EXPECT_TRUE(observer.latest_explanations().scheme_is_cryptographic);
EXPECT_FALSE(observer.latest_explanations().pkp_bypassed);
EXPECT_TRUE(observer.latest_explanations().info_explanations.empty());
- EXPECT_FALSE(observer.latest_explanations().displayed_insecure_content);
- EXPECT_FALSE(observer.latest_explanations().ran_insecure_content);
+ EXPECT_FALSE(observer.latest_explanations().displayed_mixed_content);
+ EXPECT_FALSE(observer.latest_explanations().ran_mixed_content);
}
// After AddNonsecureUrlHandler() is called, requests to this hostname
« no previous file with comments | « chrome/browser/ssl/chrome_security_state_model_client.cc ('k') | chrome/browser/ssl/chrome_security_state_model_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698