| Index: net/socket/socket_test_util.h
|
| diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
|
| index d059e89751a4be751f253d03c79bce6bf5f32b1b..f9f2dfba847d0717dd5581e06b7997ddaa1d0b21 100644
|
| --- a/net/socket/socket_test_util.h
|
| +++ b/net/socket/socket_test_util.h
|
| @@ -48,7 +48,7 @@ enum {
|
|
|
| class AsyncSocket;
|
| class MockClientSocket;
|
| -class OriginBoundCertService;
|
| +class ServerBoundCertService;
|
| class SSLClientSocket;
|
| class SSLHostInfo;
|
| class StreamSocket;
|
| @@ -280,8 +280,8 @@ struct SSLSocketDataProvider {
|
| bool client_cert_sent;
|
| SSLCertRequestInfo* cert_request_info;
|
| scoped_refptr<X509Certificate> cert;
|
| - SSLClientCertType origin_bound_cert_type;
|
| - OriginBoundCertService* origin_bound_cert_service;
|
| + SSLClientCertType domain_bound_cert_type;
|
| + ServerBoundCertService* server_bound_cert_service;
|
| };
|
|
|
| // A DataProvider where the client must write a request before the reads (e.g.
|
| @@ -601,7 +601,7 @@ class MockClientSocket : public SSLClientSocket {
|
| unsigned int outlen) OVERRIDE;
|
| virtual NextProtoStatus GetNextProto(std::string* proto,
|
| std::string* server_protos) OVERRIDE;
|
| - virtual OriginBoundCertService* GetOriginBoundCertService() const OVERRIDE;
|
| + virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE;
|
|
|
| protected:
|
| virtual ~MockClientSocket();
|
| @@ -756,11 +756,11 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket {
|
| // This MockSocket does not implement the manual async IO feature.
|
| virtual void OnReadComplete(const MockRead& data) OVERRIDE;
|
|
|
| - virtual bool WasOriginBoundCertSent() const OVERRIDE;
|
| - virtual SSLClientCertType origin_bound_cert_type() const OVERRIDE;
|
| - virtual SSLClientCertType set_origin_bound_cert_type(
|
| + virtual bool WasDomainBoundCertSent() const OVERRIDE;
|
| + virtual SSLClientCertType domain_bound_cert_type() const OVERRIDE;
|
| + virtual SSLClientCertType set_domain_bound_cert_type(
|
| SSLClientCertType type) OVERRIDE;
|
| - virtual OriginBoundCertService* GetOriginBoundCertService() const OVERRIDE;
|
| + virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE;
|
|
|
| private:
|
| static void ConnectCallback(MockSSLClientSocket *ssl_client_socket,
|
|
|