Index: net/socket/ssl_client_socket_unittest.cc |
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc |
index 6a9d4654bdf5c0cf3923e6b41898f74cd4dbb3a1..2c1f807e6b9f2984763605fe7bb48734c2b72351 100644 |
--- a/net/socket/ssl_client_socket_unittest.cc |
+++ b/net/socket/ssl_client_socket_unittest.cc |
@@ -21,6 +21,7 @@ |
#include "net/base/test_data_directory.h" |
#include "net/cert/asn1_util.h" |
#include "net/cert/ct_policy_enforcer.h" |
+#include "net/cert/ct_policy_status.h" |
#include "net/cert/ct_verifier.h" |
#include "net/cert/mock_cert_verifier.h" |
#include "net/cert/test_root_certs.h" |
@@ -685,10 +686,10 @@ class MockCTVerifier : public CTVerifier { |
class MockCTPolicyEnforcer : public CTPolicyEnforcer { |
public: |
MOCK_METHOD4(DoesConformToCTEVPolicy, |
- bool(X509Certificate* cert, |
- const ct::EVCertsWhitelist*, |
- const ct::CTVerifyResult&, |
- const BoundNetLog&)); |
+ ct::EVPolicyCompliance(X509Certificate* cert, |
+ const ct::EVCertsWhitelist*, |
+ const ct::SCTList&, |
+ const BoundNetLog&)); |
}; |
class SSLClientSocketTest : public PlatformTest { |
@@ -2335,7 +2336,8 @@ TEST_F(SSLClientSocketTest, EVCertStatusMaintainedForCompliantCert) { |
MockCTPolicyEnforcer policy_enforcer; |
SetCTPolicyEnforcer(&policy_enforcer); |
EXPECT_CALL(policy_enforcer, DoesConformToCTEVPolicy(_, _, _, _)) |
- .WillRepeatedly(Return(true)); |
+ .WillRepeatedly( |
+ Return(ct::EVPolicyCompliance::EV_POLICY_COMPLIES_VIA_SCTS)); |
int rv; |
ASSERT_TRUE(CreateAndConnectSSLClientSocket(ssl_config, &rv)); |
@@ -2367,7 +2369,8 @@ TEST_F(SSLClientSocketTest, EVCertStatusRemovedForNonCompliantCert) { |
MockCTPolicyEnforcer policy_enforcer; |
SetCTPolicyEnforcer(&policy_enforcer); |
EXPECT_CALL(policy_enforcer, DoesConformToCTEVPolicy(_, _, _, _)) |
- .WillRepeatedly(Return(false)); |
+ .WillRepeatedly( |
+ Return(ct::EVPolicyCompliance::EV_POLICY_NOT_ENOUGH_SCTS)); |
int rv; |
ASSERT_TRUE(CreateAndConnectSSLClientSocket(ssl_config, &rv)); |