Index: chrome/browser/ssl/chrome_ssl_host_state_delegate_test.cc |
diff --git a/chrome/browser/ssl/chrome_ssl_host_state_delegate_test.cc b/chrome/browser/ssl/chrome_ssl_host_state_delegate_test.cc |
index dfa4f512084ceff114b5c184e2d86b3c66ed34ff..a4b7e72edbb8d248d6fe79d4c26648c5f349d88f 100644 |
--- a/chrome/browser/ssl/chrome_ssl_host_state_delegate_test.cc |
+++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate_test.cc |
@@ -126,12 +126,8 @@ IN_PROC_BROWSER_TEST_F(ChromeSSLHostStateDelegateTest, QueryPolicy) { |
net::CERT_STATUS_DATE_INVALID, |
&unused_value)); |
- // Simulate a user decision to deny an invalid certificate for kExampleHost. |
- state->DenyCert( |
- kExampleHost, google_cert.get(), net::CERT_STATUS_DATE_INVALID); |
- |
- // Verify that kWWWGoogleHost is allowed and kExampleHost is denied while |
- // kGoogleHost still has no associated decision. |
+ // Verify that kWWWGoogleHost is allowed and kGoogleHost still has no |
+ // associated decision. |
EXPECT_EQ(net::CertPolicy::ALLOWED, |
state->QueryPolicy(kWWWGoogleHost, |
google_cert.get(), |
@@ -142,15 +138,10 @@ IN_PROC_BROWSER_TEST_F(ChromeSSLHostStateDelegateTest, QueryPolicy) { |
google_cert.get(), |
net::CERT_STATUS_DATE_INVALID, |
&unused_value)); |
- EXPECT_EQ(net::CertPolicy::DENIED, |
- state->QueryPolicy(kExampleHost, |
- google_cert.get(), |
- net::CERT_STATUS_DATE_INVALID, |
- &unused_value)); |
} |
// HasPolicyAndRevoke unit tests the expected behavior of calling |
-// HasUserDecision before and after calling RevokeUserDecisions on the |
+// HasAllowed before and after calling RevokeUserDecisions on the |
// SSLHostStateDelegate class. |
IN_PROC_BROWSER_TEST_F(ChromeSSLHostStateDelegateTest, HasPolicyAndRevoke) { |
scoped_refptr<net::X509Certificate> google_cert = GetGoogleCert(); |
@@ -168,12 +159,12 @@ IN_PROC_BROWSER_TEST_F(ChromeSSLHostStateDelegateTest, HasPolicyAndRevoke) { |
state->AllowCert( |
kExampleHost, google_cert.get(), net::CERT_STATUS_DATE_INVALID); |
- // Verify that HasUserDecision correctly acknowledges that a user decision has |
- // been made about kWWWGoogleHost. Then verify that HasUserDecision correctly |
+ // Verify that HasAllowed correctly acknowledges that a user decision has |
+ // been made about kWWWGoogleHost. Then verify that HasAllowed correctly |
// identifies that the decision has been revoked. |
- EXPECT_TRUE(state->HasUserDecision(kWWWGoogleHost)); |
+ EXPECT_TRUE(state->HasAllowed(kWWWGoogleHost)); |
state->RevokeUserDecisions(kWWWGoogleHost); |
- EXPECT_FALSE(state->HasUserDecision(kWWWGoogleHost)); |
+ EXPECT_FALSE(state->HasAllowed(kWWWGoogleHost)); |
EXPECT_EQ(net::CertPolicy::UNKNOWN, |
state->QueryPolicy(kWWWGoogleHost, |
google_cert.get(), |
@@ -182,14 +173,14 @@ IN_PROC_BROWSER_TEST_F(ChromeSSLHostStateDelegateTest, HasPolicyAndRevoke) { |
// Verify that the revocation of the kWWWGoogleHost decision does not affect |
// the Allow for kExampleHost. |
- EXPECT_TRUE(state->HasUserDecision(kExampleHost)); |
+ EXPECT_TRUE(state->HasAllowed(kExampleHost)); |
// Verify the revocation of the kWWWGoogleHost decision does not affect the |
// non-decision for kGoogleHost. Then verify that a revocation of a URL with |
// no decision has no effect. |
- EXPECT_FALSE(state->HasUserDecision(kGoogleHost)); |
+ EXPECT_FALSE(state->HasAllowed(kGoogleHost)); |
state->RevokeUserDecisions(kGoogleHost); |
- EXPECT_FALSE(state->HasUserDecision(kGoogleHost)); |
+ EXPECT_FALSE(state->HasAllowed(kGoogleHost)); |
} |
// Clear unit tests the expected behavior of calling Clear to forget all cert |
@@ -212,13 +203,13 @@ IN_PROC_BROWSER_TEST_F(ChromeSSLHostStateDelegateTest, Clear) { |
// decision made, and kExampleHost, which was untouched, are now in a |
// non-decision state. |
state->Clear(); |
- EXPECT_FALSE(state->HasUserDecision(kWWWGoogleHost)); |
+ EXPECT_FALSE(state->HasAllowed(kWWWGoogleHost)); |
EXPECT_EQ(net::CertPolicy::UNKNOWN, |
state->QueryPolicy(kWWWGoogleHost, |
google_cert.get(), |
net::CERT_STATUS_DATE_INVALID, |
&unused_value)); |
- EXPECT_FALSE(state->HasUserDecision(kExampleHost)); |
+ EXPECT_FALSE(state->HasAllowed(kExampleHost)); |
EXPECT_EQ(net::CertPolicy::UNKNOWN, |
state->QueryPolicy(kExampleHost, |
google_cert.get(), |