diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 22:54:53 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 22:54:53 +0000 |
| commit | d7c9f429c2a8d56e394f8b0f037158cb64736cb4 (patch) | |
| tree | 0e230984a6f0f5ae4488795d81e321f616687bac /net/socket/ssl_client_socket_pool.cc | |
| parent | 79440c5ed48b25cce5edce8c23a3b7722f78ae8d (diff) | |
| download | chromium_src-d7c9f429c2a8d56e394f8b0f037158cb64736cb4.zip chromium_src-d7c9f429c2a8d56e394f8b0f037158cb64736cb4.tar.gz chromium_src-d7c9f429c2a8d56e394f8b0f037158cb64736cb4.tar.bz2 | |
Rename the following SSLClientSocket methods to match the style guide:
wasNpnNegotiated() -> was_npn_negotiated()
setWasNpnNegotiated() -> set_was_npn_negotiated()
wasSpdyNegotiated() -> was_spdy_negotiated()
setWasSpdyNegotiated() -> set_was_spdy_negotiated()
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3229004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_pool.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_pool.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc index 12d273d..cb321ab 100644 --- a/net/socket/ssl_client_socket_pool.cc +++ b/net/socket/ssl_client_socket_pool.cc @@ -282,7 +282,7 @@ int SSLConnectJob::DoSSLConnectComplete(int result) { // If we want spdy over npn, make sure it succeeded. if (status == SSLClientSocket::kNextProtoNegotiated) { - ssl_socket_->setWasNpnNegotiated(true); + ssl_socket_->set_was_npn_negotiated(true); SSLClientSocket::NextProto next_protocol = SSLClientSocket::NextProtoFromString(proto); // If we negotiated either version of SPDY, we must have @@ -290,10 +290,10 @@ int SSLConnectJob::DoSSLConnectComplete(int result) { // TODO(mbelshe): verify it was a protocol we advertised? if (next_protocol == SSLClientSocket::kProtoSPDY1 || next_protocol == SSLClientSocket::kProtoSPDY2) { - ssl_socket_->setWasSpdyNegotiated(true); + ssl_socket_->set_was_spdy_negotiated(true); } } - if (params_->want_spdy_over_npn() && !ssl_socket_->wasSpdyNegotiated()) + if (params_->want_spdy_over_npn() && !ssl_socket_->was_spdy_negotiated()) return ERR_NPN_NEGOTIATION_FAILED; // Spdy might be turned on by default, or it might be over npn. |