Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(563)

Unified Diff: net/socket/ssl_client_socket_openssl.h

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix cookies_list.js Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 19feddb78ebcd6a82fb280369aa2e88c5524f6cf..06b91db8961ba30083ad98e90b8771ad2226ca0a 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,
@@ -223,7 +223,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_;
@@ -252,13 +252,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_;
};

Powered by Google App Engine
This is Rietveld 408576698