diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-22 23:07:51 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-22 23:07:51 +0000 |
| commit | e58c1b8db87ac5536ed93daa49513bad4b35f99e (patch) | |
| tree | c50075e887b150a7ac891ab62f1ac01910795a22 /net/spdy/spdy_network_transaction_unittest.cc | |
| parent | 4c8d10bda1f331a21f9fd79e92691fd9b0f30b2d (diff) | |
| download | chromium_src-e58c1b8db87ac5536ed93daa49513bad4b35f99e.zip chromium_src-e58c1b8db87ac5536ed93daa49513bad4b35f99e.tar.gz chromium_src-e58c1b8db87ac5536ed93daa49513bad4b35f99e.tar.bz2 | |
Simplify the initialization of the various NPN fields in SSLSocketDataProvider.
Review URL: http://codereview.chromium.org/9413018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123125 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_network_transaction_unittest.cc')
| -rw-r--r-- | net/spdy/spdy_network_transaction_unittest.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc index bf00bf4..a10acd0 100644 --- a/net/spdy/spdy_network_transaction_unittest.cc +++ b/net/spdy/spdy_network_transaction_unittest.cc @@ -233,10 +233,7 @@ class SpdyNetworkTransactionTest linked_ptr<SSLSocketDataProvider> ssl_( new SSLSocketDataProvider(true, OK)); if (test_type_ == SPDYNPN) { - ssl_->next_proto_status = SSLClientSocket::kNextProtoNegotiated; - ssl_->next_proto = "spdy/2.1"; - ssl_->was_npn_negotiated = true; - ssl_->protocol_negotiated = SSLClientSocket::kProtoSPDY21; + ssl_->SetNextProto(SSLClientSocket::kProtoSPDY21); } ssl_vector_.push_back(ssl_); if (test_type_ == SPDYNPN || test_type_ == SPDYSSL) @@ -261,10 +258,7 @@ class SpdyNetworkTransactionTest linked_ptr<SSLSocketDataProvider> ssl_( new SSLSocketDataProvider(true, OK)); if (test_type_ == SPDYNPN) { - ssl_->next_proto_status = SSLClientSocket::kNextProtoNegotiated; - ssl_->next_proto = "spdy/2.1"; - ssl_->was_npn_negotiated = true; - ssl_->protocol_negotiated = SSLClientSocket::kProtoSPDY21; + ssl_->SetNextProto(SSLClientSocket::kProtoSPDY21); } ssl_vector_.push_back(ssl_); if (test_type_ == SPDYNPN || test_type_ == SPDYSSL) { |