| Index: net/socket/ssl_client_socket_openssl.h
|
| diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h
|
| index ac85483c4e370bc08287309abcba64353f8a5631..bc88bb00076ca5a904e3d214784b3ba6a981381b 100644
|
| --- a/net/socket/ssl_client_socket_openssl.h
|
| +++ b/net/socket/ssl_client_socket_openssl.h
|
| @@ -15,7 +15,7 @@
|
| #include "net/cert/cert_verify_result.h"
|
| #include "net/socket/client_socket_handle.h"
|
| #include "net/socket/ssl_client_socket.h"
|
| -#include "net/ssl/server_bound_cert_service.h"
|
| +#include "net/ssl/channel_id_service.h"
|
| #include "net/ssl/ssl_client_cert_type.h"
|
| #include "net/ssl/ssl_config_service.h"
|
|
|
| @@ -61,7 +61,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
|
| SSLCertRequestInfo* cert_request_info) OVERRIDE;
|
| virtual NextProtoStatus GetNextProto(std::string* proto,
|
| std::string* server_protos) OVERRIDE;
|
| - virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE;
|
| + virtual ChannelIDService* GetChannelIDService() const OVERRIDE;
|
|
|
| // SSLSocket implementation.
|
| virtual int ExportKeyingMaterial(const base::StringPiece& label,
|
| @@ -204,7 +204,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
|
| scoped_ptr<SingleRequestCertVerifier> verifier_;
|
|
|
| // The service for retrieving Channel ID keys. May be NULL.
|
| - ServerBoundCertService* server_bound_cert_service_;
|
| + ChannelIDService* channel_id_service_;
|
|
|
| // OpenSSL stuff
|
| SSL* ssl_;
|
| @@ -233,13 +233,13 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
|
| NextProtoStatus npn_status_;
|
| std::string npn_proto_;
|
| std::string server_protos_;
|
| - // Written by the |server_bound_cert_service_|.
|
| + // Written by the |channel_id_service_|.
|
| std::string channel_id_private_key_;
|
| std::string channel_id_cert_;
|
| // True if channel ID extension was negotiated.
|
| bool channel_id_xtn_negotiated_;
|
| - // The request handle for |server_bound_cert_service_|.
|
| - ServerBoundCertService::RequestHandle channel_id_request_handle_;
|
| + // The request handle for |channel_id_service_|.
|
| + ChannelIDService::RequestHandle channel_id_request_handle_;
|
| BoundNetLog net_log_;
|
| };
|
|
|
|
|