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

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

Issue 1440303002: Componentize SecurityStateModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android/cros fixes Created 5 years, 1 month 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
Index: chrome/browser/ssl/chrome_security_state_model_delegate_browser_tests.cc
diff --git a/chrome/browser/ssl/security_state_model_browser_tests.cc b/chrome/browser/ssl/chrome_security_state_model_delegate_browser_tests.cc
similarity index 75%
rename from chrome/browser/ssl/security_state_model_browser_tests.cc
rename to chrome/browser/ssl/chrome_security_state_model_delegate_browser_tests.cc
index 727dd26ababd62ae93ec05c26dbd82e5c7a401aa..662a1300e3b11b718379c21077b94cd598fc5181 100644
--- a/chrome/browser/ssl/security_state_model_browser_tests.cc
+++ b/chrome/browser/ssl/chrome_security_state_model_delegate_browser_tests.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ssl/security_state_model.h"
+#include "chrome/browser/ssl/chrome_security_state_model_delegate.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
@@ -44,16 +44,17 @@ const base::FilePath::CharType kDocRoot[] =
void CheckSecurityInfoForSecure(
content::WebContents* contents,
- SecurityStateModel::SecurityLevel expect_security_level,
- SecurityStateModel::SHA1DeprecationStatus expect_sha1_status,
- SecurityStateModel::MixedContentStatus expect_mixed_content_status,
+ security_state::SecurityLevel expect_security_level,
+ security_state::SHA1DeprecationStatus expect_sha1_status,
+ security_state::MixedContentStatus expect_mixed_content_status,
bool expect_cert_error) {
ASSERT_TRUE(contents);
- SecurityStateModel* model = SecurityStateModel::FromWebContents(contents);
- ASSERT_TRUE(model);
- const SecurityStateModel::SecurityInfo& security_info =
- model->GetSecurityInfo();
+ ChromeSecurityStateModelDelegate* model_delegate =
+ ChromeSecurityStateModelDelegate::FromWebContents(contents);
+ ASSERT_TRUE(model_delegate);
+ const security_state::SecurityInfo& security_info =
+ model_delegate->GetSecurityInfo();
EXPECT_EQ(expect_security_level, security_info.security_level);
EXPECT_EQ(expect_sha1_status, security_info.sha1_deprecation_status);
EXPECT_EQ(expect_mixed_content_status, security_info.mixed_content_status);
@@ -71,14 +72,15 @@ void CheckSecurityInfoForSecure(
void CheckSecurityInfoForNonSecure(content::WebContents* contents) {
ASSERT_TRUE(contents);
- SecurityStateModel* model = SecurityStateModel::FromWebContents(contents);
- ASSERT_TRUE(model);
- const SecurityStateModel::SecurityInfo& security_info =
- model->GetSecurityInfo();
- EXPECT_EQ(SecurityStateModel::NONE, security_info.security_level);
- EXPECT_EQ(SecurityStateModel::NO_DEPRECATED_SHA1,
+ ChromeSecurityStateModelDelegate* model_delegate =
+ ChromeSecurityStateModelDelegate::FromWebContents(contents);
+ ASSERT_TRUE(model_delegate);
+ const security_state::SecurityInfo& security_info =
+ model_delegate->GetSecurityInfo();
+ EXPECT_EQ(security_state::NONE, security_info.security_level);
+ EXPECT_EQ(security_state::NO_DEPRECATED_SHA1,
security_info.sha1_deprecation_status);
- EXPECT_EQ(SecurityStateModel::NO_MIXED_CONTENT,
+ EXPECT_EQ(security_state::NO_MIXED_CONTENT,
security_info.mixed_content_status);
EXPECT_TRUE(security_info.sct_verify_statuses.empty());
EXPECT_FALSE(security_info.scheme_is_cryptographic);
@@ -87,9 +89,9 @@ void CheckSecurityInfoForNonSecure(content::WebContents* contents) {
EXPECT_EQ(0, security_info.cert_id);
}
-class SecurityStateModelTest : public CertVerifierBrowserTest {
+class ChromeSecurityStateModelDelegateTest : public CertVerifierBrowserTest {
public:
- SecurityStateModelTest()
+ ChromeSecurityStateModelDelegateTest()
: https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {
https_server_.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot));
}
@@ -138,10 +140,10 @@ class SecurityStateModelTest : public CertVerifierBrowserTest {
net::EmbeddedTestServer https_server_;
private:
- DISALLOW_COPY_AND_ASSIGN(SecurityStateModelTest);
+ DISALLOW_COPY_AND_ASSIGN(ChromeSecurityStateModelDelegateTest);
};
-IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, HttpPage) {
+IN_PROC_BROWSER_TEST_F(ChromeSecurityStateModelDelegateTest, HttpPage) {
ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL("/ssl/google.html"));
@@ -149,14 +151,15 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, HttpPage) {
browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(contents);
- SecurityStateModel* model = SecurityStateModel::FromWebContents(contents);
- ASSERT_TRUE(model);
- const SecurityStateModel::SecurityInfo& security_info =
- model->GetSecurityInfo();
- EXPECT_EQ(SecurityStateModel::NONE, security_info.security_level);
- EXPECT_EQ(SecurityStateModel::NO_DEPRECATED_SHA1,
+ ChromeSecurityStateModelDelegate* model_delegate =
+ ChromeSecurityStateModelDelegate::FromWebContents(contents);
+ ASSERT_TRUE(model_delegate);
+ const security_state::SecurityInfo& security_info =
+ model_delegate->GetSecurityInfo();
+ EXPECT_EQ(security_state::NONE, security_info.security_level);
+ EXPECT_EQ(security_state::NO_DEPRECATED_SHA1,
security_info.sha1_deprecation_status);
- EXPECT_EQ(SecurityStateModel::NO_MIXED_CONTENT,
+ EXPECT_EQ(security_state::NO_MIXED_CONTENT,
security_info.mixed_content_status);
EXPECT_TRUE(security_info.sct_verify_statuses.empty());
EXPECT_FALSE(security_info.scheme_is_cryptographic);
@@ -166,7 +169,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, HttpPage) {
EXPECT_EQ(0, security_info.connection_status);
}
-IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, HttpsPage) {
+IN_PROC_BROWSER_TEST_F(ChromeSecurityStateModelDelegateTest, HttpsPage) {
ASSERT_TRUE(https_server_.Start());
SetUpMockCertVerifierForHttpsServer(0, net::OK);
@@ -174,12 +177,11 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, HttpsPage) {
https_server_.GetURL("/ssl/google.html"));
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURE, SecurityStateModel::NO_DEPRECATED_SHA1,
- SecurityStateModel::NO_MIXED_CONTENT,
- false /* expect cert status error */);
+ security_state::SECURE, security_state::NO_DEPRECATED_SHA1,
+ security_state::NO_MIXED_CONTENT, false /* expect cert status error */);
}
-IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, SHA1Broken) {
+IN_PROC_BROWSER_TEST_F(ChromeSecurityStateModelDelegateTest, SHA1Broken) {
ASSERT_TRUE(https_server_.Start());
// The test server uses a long-lived cert by default, so a SHA1
// signature in it will register as a "broken" condition rather than
@@ -191,13 +193,11 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, SHA1Broken) {
https_server_.GetURL("/ssl/google.html"));
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURITY_ERROR,
- SecurityStateModel::DEPRECATED_SHA1_MAJOR,
- SecurityStateModel::NO_MIXED_CONTENT,
- false /* expect cert status error */);
+ security_state::SECURITY_ERROR, security_state::DEPRECATED_SHA1_MAJOR,
+ security_state::NO_MIXED_CONTENT, false /* expect cert status error */);
}
-IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, MixedContent) {
+IN_PROC_BROWSER_TEST_F(ChromeSecurityStateModelDelegateTest, MixedContent) {
ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_TRUE(https_server_.Start());
SetUpMockCertVerifierForHttpsServer(0, net::OK);
@@ -211,8 +211,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, MixedContent) {
https_server_.GetURL(replacement_path));
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::NONE, SecurityStateModel::NO_DEPRECATED_SHA1,
- SecurityStateModel::DISPLAYED_MIXED_CONTENT,
+ security_state::NONE, security_state::NO_DEPRECATED_SHA1,
+ security_state::DISPLAYED_MIXED_CONTENT,
false /* expect cert status error */);
// Navigate to an HTTPS page that displays mixed content dynamically.
@@ -223,9 +223,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, MixedContent) {
https_server_.GetURL(replacement_path));
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURE, SecurityStateModel::NO_DEPRECATED_SHA1,
- SecurityStateModel::NO_MIXED_CONTENT,
- false /* expect cert status error */);
+ security_state::SECURE, security_state::NO_DEPRECATED_SHA1,
+ security_state::NO_MIXED_CONTENT, false /* expect cert status error */);
// Load the insecure image.
bool js_result = false;
EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
@@ -234,8 +233,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, MixedContent) {
EXPECT_TRUE(js_result);
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::NONE, SecurityStateModel::NO_DEPRECATED_SHA1,
- SecurityStateModel::DISPLAYED_MIXED_CONTENT,
+ security_state::NONE, security_state::NO_DEPRECATED_SHA1,
+ security_state::DISPLAYED_MIXED_CONTENT,
false /* expect cert status error */);
// Navigate to an HTTPS page that runs mixed content.
@@ -246,10 +245,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, MixedContent) {
https_server_.GetURL(replacement_path));
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURITY_ERROR,
- SecurityStateModel::NO_DEPRECATED_SHA1,
- SecurityStateModel::RAN_MIXED_CONTENT,
- false /* expect cert status error */);
+ security_state::SECURITY_ERROR, security_state::NO_DEPRECATED_SHA1,
+ security_state::RAN_MIXED_CONTENT, false /* expect cert status error */);
// Navigate to an HTTPS page that runs and displays mixed content.
GetFilePathWithHostAndPortReplacement(
@@ -259,9 +256,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, MixedContent) {
https_server_.GetURL(replacement_path));
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURITY_ERROR,
- SecurityStateModel::NO_DEPRECATED_SHA1,
- SecurityStateModel::RAN_AND_DISPLAYED_MIXED_CONTENT,
+ security_state::SECURITY_ERROR, security_state::NO_DEPRECATED_SHA1,
+ security_state::RAN_AND_DISPLAYED_MIXED_CONTENT,
false /* expect cert status error */);
// Navigate to an HTTPS page that runs mixed content in an iframe.
@@ -279,14 +275,13 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, MixedContent) {
https_server_.GetURL(replacement_path));
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURITY_ERROR,
- SecurityStateModel::NO_DEPRECATED_SHA1,
- SecurityStateModel::RAN_MIXED_CONTENT,
- false /* expect cert status error */);
+ security_state::SECURITY_ERROR, security_state::NO_DEPRECATED_SHA1,
+ security_state::RAN_MIXED_CONTENT, false /* expect cert status error */);
}
// Same as the test above but with a long-lived SHA1 cert.
-IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, MixedContentWithBrokenSHA1) {
+IN_PROC_BROWSER_TEST_F(ChromeSecurityStateModelDelegateTest,
+ MixedContentWithBrokenSHA1) {
ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_TRUE(https_server_.Start());
// The test server uses a long-lived cert by default, so a SHA1
@@ -304,9 +299,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, MixedContentWithBrokenSHA1) {
https_server_.GetURL(replacement_path));
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURITY_ERROR,
- SecurityStateModel::DEPRECATED_SHA1_MAJOR,
- SecurityStateModel::DISPLAYED_MIXED_CONTENT,
+ security_state::SECURITY_ERROR, security_state::DEPRECATED_SHA1_MAJOR,
+ security_state::DISPLAYED_MIXED_CONTENT,
false /* expect cert status error */);
// Navigate to an HTTPS page that displays mixed content dynamically.
@@ -317,10 +311,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, MixedContentWithBrokenSHA1) {
https_server_.GetURL(replacement_path));
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURITY_ERROR,
- SecurityStateModel::DEPRECATED_SHA1_MAJOR,
- SecurityStateModel::NO_MIXED_CONTENT,
- false /* expect cert status error */);
+ security_state::SECURITY_ERROR, security_state::DEPRECATED_SHA1_MAJOR,
+ security_state::NO_MIXED_CONTENT, false /* expect cert status error */);
// Load the insecure image.
bool js_result = false;
EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
@@ -329,9 +321,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, MixedContentWithBrokenSHA1) {
EXPECT_TRUE(js_result);
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURITY_ERROR,
- SecurityStateModel::DEPRECATED_SHA1_MAJOR,
- SecurityStateModel::DISPLAYED_MIXED_CONTENT,
+ security_state::SECURITY_ERROR, security_state::DEPRECATED_SHA1_MAJOR,
+ security_state::DISPLAYED_MIXED_CONTENT,
false /* expect cert status error */);
// Navigate to an HTTPS page that runs mixed content.
@@ -342,10 +333,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, MixedContentWithBrokenSHA1) {
https_server_.GetURL(replacement_path));
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURITY_ERROR,
- SecurityStateModel::DEPRECATED_SHA1_MAJOR,
- SecurityStateModel::RAN_MIXED_CONTENT,
- false /* expect cert status error */);
+ security_state::SECURITY_ERROR, security_state::DEPRECATED_SHA1_MAJOR,
+ security_state::RAN_MIXED_CONTENT, false /* expect cert status error */);
// Navigate to an HTTPS page that runs and displays mixed content.
GetFilePathWithHostAndPortReplacement(
@@ -355,13 +344,12 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, MixedContentWithBrokenSHA1) {
https_server_.GetURL(replacement_path));
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURITY_ERROR,
- SecurityStateModel::DEPRECATED_SHA1_MAJOR,
- SecurityStateModel::RAN_AND_DISPLAYED_MIXED_CONTENT,
+ security_state::SECURITY_ERROR, security_state::DEPRECATED_SHA1_MAJOR,
+ security_state::RAN_AND_DISPLAYED_MIXED_CONTENT,
false /* expect cert status error */);
}
-IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, BrokenHTTPS) {
+IN_PROC_BROWSER_TEST_F(ChromeSecurityStateModelDelegateTest, BrokenHTTPS) {
ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_TRUE(https_server_.Start());
SetUpMockCertVerifierForHttpsServer(net::CERT_STATUS_DATE_INVALID,
@@ -371,20 +359,16 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, BrokenHTTPS) {
https_server_.GetURL("/ssl/google.html"));
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURITY_ERROR,
- SecurityStateModel::NO_DEPRECATED_SHA1,
- SecurityStateModel::NO_MIXED_CONTENT,
- true /* expect cert status error */);
+ security_state::SECURITY_ERROR, security_state::NO_DEPRECATED_SHA1,
+ security_state::NO_MIXED_CONTENT, true /* expect cert status error */);
ProceedThroughInterstitial(
browser()->tab_strip_model()->GetActiveWebContents());
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURITY_ERROR,
- SecurityStateModel::NO_DEPRECATED_SHA1,
- SecurityStateModel::NO_MIXED_CONTENT,
- true /* expect cert status error */);
+ security_state::SECURITY_ERROR, security_state::NO_DEPRECATED_SHA1,
+ security_state::NO_MIXED_CONTENT, true /* expect cert status error */);
// Navigate to a broken HTTPS page that displays mixed content.
std::string replacement_path;
@@ -395,9 +379,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, BrokenHTTPS) {
https_server_.GetURL(replacement_path));
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURITY_ERROR,
- SecurityStateModel::NO_DEPRECATED_SHA1,
- SecurityStateModel::DISPLAYED_MIXED_CONTENT,
+ security_state::SECURITY_ERROR, security_state::NO_DEPRECATED_SHA1,
+ security_state::DISPLAYED_MIXED_CONTENT,
true /* expect cert status error */);
}
@@ -427,9 +410,10 @@ void InstallLoadingInterceptor(const std::string& host) {
scoped_ptr<net::URLRequestInterceptor>(new PendingJobInterceptor()));
}
-class SecurityStateModelLoadingTest : public SecurityStateModelTest {
+class SecurityStateModelLoadingTest
+ : public ChromeSecurityStateModelDelegateTest {
public:
- SecurityStateModelLoadingTest() : SecurityStateModelTest() {}
+ SecurityStateModelLoadingTest() : ChromeSecurityStateModelDelegateTest() {}
~SecurityStateModelLoadingTest() override{};
protected:
@@ -456,9 +440,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelLoadingTest, NavigationStateChanges) {
https_server_.GetURL("/ssl/google.html"));
CheckSecurityInfoForSecure(
browser()->tab_strip_model()->GetActiveWebContents(),
- SecurityStateModel::SECURE, SecurityStateModel::NO_DEPRECATED_SHA1,
- SecurityStateModel::NO_MIXED_CONTENT,
- false /* expect cert status error */);
+ security_state::SECURE, security_state::NO_DEPRECATED_SHA1,
+ security_state::NO_MIXED_CONTENT, false /* expect cert status error */);
// Navigate to a page that doesn't finish loading. Test that the
// security state is neutral while the page is loading.
@@ -471,7 +454,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelLoadingTest, NavigationStateChanges) {
// Tests that the SecurityStateModel for a WebContents is up-to-date
// when the WebContents is inserted into a Browser's TabStripModel.
-IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, AddedTab) {
+IN_PROC_BROWSER_TEST_F(ChromeSecurityStateModelDelegateTest, AddedTab) {
ASSERT_TRUE(https_server_.Start());
SetUpMockCertVerifierForHttpsServer(0, net::OK);
@@ -482,22 +465,21 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelTest, AddedTab) {
content::WebContents* new_contents = content::WebContents::Create(
content::WebContents::CreateParams(tab->GetBrowserContext()));
content::NavigationController& controller = new_contents->GetController();
- SecurityStateModel::CreateForWebContents(new_contents);
+ ChromeSecurityStateModelDelegate::CreateForWebContents(new_contents);
CheckSecurityInfoForNonSecure(new_contents);
- controller.LoadURL(https_server_.GetURL("/"), content::Referrer(),
- ui::PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(https_server_.GetURL("/ssl/google.html"),
+ content::Referrer(), ui::PAGE_TRANSITION_TYPED,
+ std::string());
EXPECT_TRUE(content::WaitForLoadStop(new_contents));
- CheckSecurityInfoForSecure(new_contents, SecurityStateModel::SECURE,
- SecurityStateModel::NO_DEPRECATED_SHA1,
- SecurityStateModel::NO_MIXED_CONTENT,
- false /* expect cert status error */);
+ CheckSecurityInfoForSecure(
+ new_contents, security_state::SECURE, security_state::NO_DEPRECATED_SHA1,
+ security_state::NO_MIXED_CONTENT, false /* expect cert status error */);
browser()->tab_strip_model()->InsertWebContentsAt(0, new_contents,
TabStripModel::ADD_NONE);
- CheckSecurityInfoForSecure(new_contents, SecurityStateModel::SECURE,
- SecurityStateModel::NO_DEPRECATED_SHA1,
- SecurityStateModel::NO_MIXED_CONTENT,
- false /* expect cert status error */);
+ CheckSecurityInfoForSecure(
+ new_contents, security_state::SECURE, security_state::NO_DEPRECATED_SHA1,
+ security_state::NO_MIXED_CONTENT, false /* expect cert status error */);
}
} // namespace
« no previous file with comments | « chrome/browser/ssl/chrome_security_state_model_delegate.cc ('k') | chrome/browser/ssl/security_state_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698