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/spdy/spdy_stream.h | |
| 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/spdy/spdy_stream.h')
| -rw-r--r-- | net/spdy/spdy_stream.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h index 3d0804b..131137d 100644 --- a/net/spdy/spdy_stream.h +++ b/net/spdy/spdy_stream.h @@ -258,10 +258,10 @@ class NET_EXPORT_PRIVATE SpdyStream private: enum State { STATE_NONE, - STATE_GET_ORIGIN_BOUND_CERT, - STATE_GET_ORIGIN_BOUND_CERT_COMPLETE, - STATE_SEND_ORIGIN_BOUND_CERT, - STATE_SEND_ORIGIN_BOUND_CERT_COMPLETE, + STATE_GET_DOMAIN_BOUND_CERT, + STATE_GET_DOMAIN_BOUND_CERT_COMPLETE, + STATE_SEND_DOMAIN_BOUND_CERT, + STATE_SEND_DOMAIN_BOUND_CERT_COMPLETE, STATE_SEND_HEADERS, STATE_SEND_HEADERS_COMPLETE, STATE_SEND_BODY, @@ -274,16 +274,16 @@ class NET_EXPORT_PRIVATE SpdyStream friend class base::RefCounted<SpdyStream>; virtual ~SpdyStream(); - void OnGetOriginBoundCertComplete(int result); + void OnGetDomainBoundCertComplete(int result); // Try to make progress sending/receiving the request/response. int DoLoop(int result); // The implementations of each state of the state machine. - int DoGetOriginBoundCert(); - int DoGetOriginBoundCertComplete(int result); - int DoSendOriginBoundCert(); - int DoSendOriginBoundCertComplete(int result); + int DoGetDomainBoundCert(); + int DoGetDomainBoundCertComplete(int result); + int DoSendDomainBoundCert(); + int DoSendDomainBoundCertComplete(int result); int DoSendHeaders(); int DoSendHeadersComplete(int result); int DoSendBody(); @@ -357,10 +357,10 @@ class NET_EXPORT_PRIVATE SpdyStream // Data received before delegate is attached. std::vector<scoped_refptr<IOBufferWithSize> > pending_buffers_; - SSLClientCertType ob_cert_type_; - std::string ob_private_key_; - std::string ob_cert_; - OriginBoundCertService::RequestHandle ob_cert_request_handle_; + SSLClientCertType domain_bound_cert_type_; + std::string domain_bound_private_key_; + std::string domain_bound_cert_; + ServerBoundCertService::RequestHandle domain_bound_cert_request_handle_; DISALLOW_COPY_AND_ASSIGN(SpdyStream); }; |