diff options
author | bnc <bnc@chromium.org> | 2015-01-09 11:22:54 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-09 19:23:49 +0000 |
commit | facdd854d5d33e01c53b06398b80005bcf0f775a (patch) | |
tree | 8c5c348956d45ee3a8fae976e9dd04b2e4a2c3ae /net/socket/socket_test_util.cc | |
parent | 8fbf60bdf5315ecf8e780ef41b59422e7a3cd0b1 (diff) | |
download | chromium_src-facdd854d5d33e01c53b06398b80005bcf0f775a.zip chromium_src-facdd854d5d33e01c53b06398b80005bcf0f775a.tar.gz chromium_src-facdd854d5d33e01c53b06398b80005bcf0f775a.tar.bz2 |
Act upon HTTP_1_1_REQUIRED.
This is a minimal working concept of retrying a connection with HTTP/1.1
upon receiving an HTTP_1_1_REQUIRED error code on an HTTP/2 connection in a
GO_AWAY or RST_STREAM frame. The change in
HttpNetworkTransaction::DoReadHeadersComplete() still needs to be refactored
into its own function in HttpNetworkConnection() at a minimum.
BUG=431306
Review URL: https://codereview.chromium.org/753583003
Cr-Commit-Position: refs/heads/master@{#310805}
Diffstat (limited to 'net/socket/socket_test_util.cc')
-rw-r--r-- | net/socket/socket_test_util.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index 308de2e..658182b 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc @@ -702,11 +702,17 @@ scoped_ptr<SSLClientSocket> MockClientSocketFactory::CreateSSLClientSocket( const HostPortPair& host_and_port, const SSLConfig& ssl_config, const SSLClientSocketContext& context) { - scoped_ptr<MockSSLClientSocket> socket( - new MockSSLClientSocket(transport_socket.Pass(), - host_and_port, - ssl_config, - mock_ssl_data_.GetNext())); + SSLSocketDataProvider* next_ssl_data = mock_ssl_data_.GetNext(); + if (!next_ssl_data->next_protos_expected_in_ssl_config.empty()) { + EXPECT_EQ(next_ssl_data->next_protos_expected_in_ssl_config.size(), + ssl_config.next_protos.size()); + EXPECT_TRUE( + std::equal(next_ssl_data->next_protos_expected_in_ssl_config.begin(), + next_ssl_data->next_protos_expected_in_ssl_config.end(), + ssl_config.next_protos.begin())); + } + scoped_ptr<MockSSLClientSocket> socket(new MockSSLClientSocket( + transport_socket.Pass(), host_and_port, ssl_config, next_ssl_data)); ssl_client_sockets_.push_back(socket.get()); return socket.Pass(); } |