diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 22:42:29 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 22:42:29 +0000 |
| commit | 9c4eff26e509149d2133268af7744a5cdb079dd1 (patch) | |
| tree | 37f5ddc3dee1ed87d40a9e8ff6dce25778cfb1e0 /net/socket/socket_test_util.cc | |
| parent | 4a210ecd52feb4f61969f329c5bd10b5746c6e2b (diff) | |
| download | chromium_src-9c4eff26e509149d2133268af7744a5cdb079dd1.zip chromium_src-9c4eff26e509149d2133268af7744a5cdb079dd1.tar.gz chromium_src-9c4eff26e509149d2133268af7744a5cdb079dd1.tar.bz2 | |
Change Origin bound certs -> Domain bound certs.
BUG=115348
TEST=unit tests, manually checked 'Origin Bound Certs' contents after browsing
TBR=jam@chromium.org,willchan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9617039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socket_test_util.cc')
| -rw-r--r-- | net/socket/socket_test_util.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index ef5b0db..f5236ab 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc @@ -242,7 +242,7 @@ SSLSocketDataProvider::SSLSocketDataProvider(IoMode mode, int result) protocol_negotiated(SSLClientSocket::kProtoUnknown), client_cert_sent(false), cert_request_info(NULL), - origin_bound_cert_type(CLIENT_CERT_INVALID_TYPE) { + domain_bound_cert_type(CLIENT_CERT_INVALID_TYPE) { } SSLSocketDataProvider::~SSLSocketDataProvider() { @@ -696,7 +696,7 @@ int MockClientSocket::ExportKeyingMaterial(const base::StringPiece& label, return OK; } -OriginBoundCertService* MockClientSocket::GetOriginBoundCertService() const { +ServerBoundCertService* MockClientSocket::GetServerBoundCertService() const { NOTREACHED(); return NULL; } @@ -1132,7 +1132,7 @@ base::TimeDelta MockSSLClientSocket::GetConnectTimeMicros() const { void MockSSLClientSocket::GetSSLInfo(SSLInfo* ssl_info) { ssl_info->Reset(); ssl_info->cert = data_->cert; - ssl_info->client_cert_sent = WasOriginBoundCertSent() || + ssl_info->client_cert_sent = WasDomainBoundCertSent() || data_->client_cert_sent; } @@ -1178,21 +1178,21 @@ void MockSSLClientSocket::set_protocol_negotiated( protocol_negotiated_ = protocol_negotiated; } -bool MockSSLClientSocket::WasOriginBoundCertSent() const { - return data_->origin_bound_cert_type != CLIENT_CERT_INVALID_TYPE; +bool MockSSLClientSocket::WasDomainBoundCertSent() const { + return data_->domain_bound_cert_type != CLIENT_CERT_INVALID_TYPE; } -SSLClientCertType MockSSLClientSocket::origin_bound_cert_type() const { - return data_->origin_bound_cert_type; +SSLClientCertType MockSSLClientSocket::domain_bound_cert_type() const { + return data_->domain_bound_cert_type; } -SSLClientCertType MockSSLClientSocket::set_origin_bound_cert_type( +SSLClientCertType MockSSLClientSocket::set_domain_bound_cert_type( SSLClientCertType type) { - return data_->origin_bound_cert_type = type; + return data_->domain_bound_cert_type = type; } -OriginBoundCertService* MockSSLClientSocket::GetOriginBoundCertService() const { - return data_->origin_bound_cert_service; +ServerBoundCertService* MockSSLClientSocket::GetServerBoundCertService() const { + return data_->server_bound_cert_service; } void MockSSLClientSocket::OnReadComplete(const MockRead& data) { |