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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/security_state/content/web_contents_security_state_model_unittest.cc

Issue 2448943002: Refactor SecurityStateModel/Clients for simplicity and reusability. (Closed)
Patch Set: Remove *SecurityModelClient. Created 4 years, 2 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
« components/security_state/content/web_contents_security_state_model.cc ('K') | « components/security_state/content/web_contents_security_state_model.cc ('k') | components/security_state/core/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/security_state/content/web_contents_security_state_model_unittest.cc
diff --git a/chrome/browser/ssl/chrome_security_state_model_client_unittest.cc b/components/security_state/content/web_contents_security_state_model_unittest.cc
similarity index 76%
rename from chrome/browser/ssl/chrome_security_state_model_client_unittest.cc
rename to components/security_state/content/web_contents_security_state_model_unittest.cc
index 9a50d7bc05b7e937f30a2843530afc2399932d46..d23d03060f1d283de976c111c425e998d3033dd7 100644
--- a/chrome/browser/ssl/chrome_security_state_model_client_unittest.cc
+++ b/components/security_state/content/web_contents_security_state_model_unittest.cc
@@ -2,9 +2,9 @@
// 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 "components/security_state/content/web_contents_security_state_model.h"
-#include "components/security_state/security_state_model.h"
+#include "components/security_state/core/security_state_model.h"
#include "content/public/browser/security_style_explanation.h"
#include "content/public/browser/security_style_explanations.h"
#include "net/cert/cert_status_flags.h"
@@ -14,10 +14,12 @@
namespace {
+using security_state::WebContentsSecurityStateModel;
+
// Tests that SecurityInfo flags for subresources with certificate
// errors are reflected in the SecurityStyleExplanations produced by
-// ChromeSecurityStateModelClient.
-TEST(ChromeSecurityStateModelClientTest,
+// WebContentsSecurityStateModel.
+TEST(WebContentsSecurityStateModelTest,
GetSecurityStyleForContentWithCertErrors) {
content::SecurityStyleExplanations explanations;
security_state::SecurityStateModel::SecurityInfo security_info;
@@ -26,29 +28,25 @@ TEST(ChromeSecurityStateModelClientTest,
security_info.content_with_cert_errors_status =
security_state::SecurityStateModel::CONTENT_STATUS_DISPLAYED_AND_RAN;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info, &explanations);
EXPECT_TRUE(explanations.ran_content_with_cert_errors);
EXPECT_TRUE(explanations.displayed_content_with_cert_errors);
security_info.content_with_cert_errors_status =
security_state::SecurityStateModel::CONTENT_STATUS_RAN;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info, &explanations);
EXPECT_TRUE(explanations.ran_content_with_cert_errors);
EXPECT_FALSE(explanations.displayed_content_with_cert_errors);
security_info.content_with_cert_errors_status =
security_state::SecurityStateModel::CONTENT_STATUS_DISPLAYED;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info, &explanations);
EXPECT_FALSE(explanations.ran_content_with_cert_errors);
EXPECT_TRUE(explanations.displayed_content_with_cert_errors);
security_info.content_with_cert_errors_status =
security_state::SecurityStateModel::CONTENT_STATUS_NONE;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info, &explanations);
EXPECT_FALSE(explanations.ran_content_with_cert_errors);
EXPECT_FALSE(explanations.displayed_content_with_cert_errors);
}
@@ -57,7 +55,7 @@ TEST(ChromeSecurityStateModelClientTest,
// errors are *not* set when the main resource has major certificate
// errors. If the main resource has certificate errors, it would be
// duplicative/confusing to also report subresources with cert errors.
-TEST(ChromeSecurityStateModelClientTest,
+TEST(WebContentsSecurityStateModelTest,
SubresourcesAndMainResourceWithMajorCertErrors) {
content::SecurityStyleExplanations explanations;
security_state::SecurityStateModel::SecurityInfo security_info;
@@ -66,29 +64,25 @@ TEST(ChromeSecurityStateModelClientTest,
security_info.content_with_cert_errors_status =
security_state::SecurityStateModel::CONTENT_STATUS_DISPLAYED_AND_RAN;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info, &explanations);
EXPECT_FALSE(explanations.ran_content_with_cert_errors);
EXPECT_FALSE(explanations.displayed_content_with_cert_errors);
security_info.content_with_cert_errors_status =
security_state::SecurityStateModel::CONTENT_STATUS_RAN;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info, &explanations);
EXPECT_FALSE(explanations.ran_content_with_cert_errors);
EXPECT_FALSE(explanations.displayed_content_with_cert_errors);
security_info.content_with_cert_errors_status =
security_state::SecurityStateModel::CONTENT_STATUS_DISPLAYED;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info, &explanations);
EXPECT_FALSE(explanations.ran_content_with_cert_errors);
EXPECT_FALSE(explanations.displayed_content_with_cert_errors);
security_info.content_with_cert_errors_status =
security_state::SecurityStateModel::CONTENT_STATUS_NONE;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info, &explanations);
EXPECT_FALSE(explanations.ran_content_with_cert_errors);
EXPECT_FALSE(explanations.displayed_content_with_cert_errors);
}
@@ -97,7 +91,7 @@ TEST(ChromeSecurityStateModelClientTest,
// errors are set when the main resource has only minor certificate
// errors. Minor errors on the main resource should not hide major
// errors on subresources.
-TEST(ChromeSecurityStateModelClientTest,
+TEST(WebContentsSecurityStateModelTest,
SubresourcesAndMainResourceWithMinorCertErrors) {
content::SecurityStyleExplanations explanations;
security_state::SecurityStateModel::SecurityInfo security_info;
@@ -106,29 +100,25 @@ TEST(ChromeSecurityStateModelClientTest,
security_info.content_with_cert_errors_status =
security_state::SecurityStateModel::CONTENT_STATUS_DISPLAYED_AND_RAN;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info, &explanations);
EXPECT_TRUE(explanations.ran_content_with_cert_errors);
EXPECT_TRUE(explanations.displayed_content_with_cert_errors);
security_info.content_with_cert_errors_status =
security_state::SecurityStateModel::CONTENT_STATUS_RAN;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info, &explanations);
EXPECT_TRUE(explanations.ran_content_with_cert_errors);
EXPECT_FALSE(explanations.displayed_content_with_cert_errors);
security_info.content_with_cert_errors_status =
security_state::SecurityStateModel::CONTENT_STATUS_DISPLAYED;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info, &explanations);
EXPECT_FALSE(explanations.ran_content_with_cert_errors);
EXPECT_TRUE(explanations.displayed_content_with_cert_errors);
security_info.content_with_cert_errors_status =
security_state::SecurityStateModel::CONTENT_STATUS_NONE;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info, &explanations);
EXPECT_FALSE(explanations.ran_content_with_cert_errors);
EXPECT_FALSE(explanations.displayed_content_with_cert_errors);
}
@@ -149,7 +139,7 @@ bool FindSecurityStyleExplanation(
// Test that connection explanations are formated as expected. Note the strings
// are not translated and so will be the same in any locale.
-TEST(ChromeSecurityStateModelClientTest, ConnectionExplanation) {
+TEST(WebContentsSecurityStateModelTest, ConnectionExplanation) {
// Test a modern configuration with a key exchange group.
security_state::SecurityStateModel::SecurityInfo security_info;
security_info.cert_status = net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION;
@@ -163,8 +153,8 @@ TEST(ChromeSecurityStateModelClientTest, ConnectionExplanation) {
{
content::SecurityStyleExplanations explanations;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info,
+ &explanations);
content::SecurityStyleExplanation explanation;
ASSERT_TRUE(FindSecurityStyleExplanation(
explanations.secure_explanations, "Secure Connection", &explanation));
@@ -180,8 +170,8 @@ TEST(ChromeSecurityStateModelClientTest, ConnectionExplanation) {
security_info.key_exchange_group = 0;
{
content::SecurityStyleExplanations explanations;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info,
+ &explanations);
content::SecurityStyleExplanation explanation;
ASSERT_TRUE(FindSecurityStyleExplanation(
explanations.secure_explanations, "Secure Connection", &explanation));
@@ -200,8 +190,8 @@ TEST(ChromeSecurityStateModelClientTest, ConnectionExplanation) {
security_info.key_exchange_group = 29; // X25519
{
content::SecurityStyleExplanations explanations;
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info,
+ &explanations);
content::SecurityStyleExplanation explanation;
ASSERT_TRUE(FindSecurityStyleExplanation(
explanations.secure_explanations, "Secure Connection", &explanation));
@@ -215,14 +205,14 @@ TEST(ChromeSecurityStateModelClientTest, ConnectionExplanation) {
// Tests that a security level of HTTP_SHOW_WARNING produces a
// content::SecurityStyle of UNAUTHENTICATED, with an explanation.
-TEST(ChromeSecurityStateModelClientTest, HTTPWarning) {
+TEST(WebContentsSecurityStateModelTest, HTTPWarning) {
security_state::SecurityStateModel::SecurityInfo security_info;
content::SecurityStyleExplanations explanations;
security_info.security_level =
security_state::SecurityStateModel::HTTP_SHOW_WARNING;
blink::WebSecurityStyle security_style =
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info,
+ &explanations);
EXPECT_EQ(blink::WebSecurityStyleUnauthenticated, security_style);
EXPECT_EQ(1u, explanations.unauthenticated_explanations.size());
}
@@ -230,14 +220,14 @@ TEST(ChromeSecurityStateModelClientTest, HTTPWarning) {
// Tests that a security level of NONE when there is a password or
// credit card field on HTTP produces a content::SecurityStyle of
// UNAUTHENTICATED, with an info explanation.
-TEST(ChromeSecurityStateModelClientTest, HTTPWarningInFuture) {
+TEST(WebContentsSecurityStateModelTest, HTTPWarningInFuture) {
security_state::SecurityStateModel::SecurityInfo security_info;
content::SecurityStyleExplanations explanations;
security_info.security_level = security_state::SecurityStateModel::NONE;
security_info.displayed_private_user_data_input_on_http = true;
blink::WebSecurityStyle security_style =
- ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
- &explanations);
+ WebContentsSecurityStateModel::GetSecurityStyle(security_info,
+ &explanations);
EXPECT_EQ(blink::WebSecurityStyleUnauthenticated, security_style);
EXPECT_EQ(1u, explanations.info_explanations.size());
}
« components/security_state/content/web_contents_security_state_model.cc ('K') | « components/security_state/content/web_contents_security_state_model.cc ('k') | components/security_state/core/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698