| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 params_.ssl_config_service = ssl_config_service_.get(); | 252 params_.ssl_config_service = ssl_config_service_.get(); |
| 253 params_.http_auth_handler_factory = auth_handler_factory_.get(); | 253 params_.http_auth_handler_factory = auth_handler_factory_.get(); |
| 254 params_.http_server_properties = http_server_properties_.GetWeakPtr(); | 254 params_.http_server_properties = http_server_properties_.GetWeakPtr(); |
| 255 params_.quic_supported_versions = SupportedVersions(GetParam()); | 255 params_.quic_supported_versions = SupportedVersions(GetParam()); |
| 256 | 256 |
| 257 if (use_next_protos) { | 257 if (use_next_protos) { |
| 258 params_.use_alternative_services = true; | 258 params_.use_alternative_services = true; |
| 259 params_.next_protos = NextProtosWithSpdyAndQuic(true, true); | 259 params_.next_protos = NextProtosWithSpdyAndQuic(true, true); |
| 260 } | 260 } |
| 261 | 261 |
| 262 session_.reset(new HttpNetworkSession(params_)); | 262 session_ = new HttpNetworkSession(params_); |
| 263 session_->quic_stream_factory()->set_require_confirmation(false); | 263 session_->quic_stream_factory()->set_require_confirmation(false); |
| 264 ASSERT_EQ(params_.quic_socket_receive_buffer_size, | 264 ASSERT_EQ(params_.quic_socket_receive_buffer_size, |
| 265 session_->quic_stream_factory()->socket_receive_buffer_size()); | 265 session_->quic_stream_factory()->socket_receive_buffer_size()); |
| 266 } | 266 } |
| 267 | 267 |
| 268 void CheckWasQuicResponse(const scoped_ptr<HttpNetworkTransaction>& trans) { | 268 void CheckWasQuicResponse(const scoped_ptr<HttpNetworkTransaction>& trans) { |
| 269 const HttpResponseInfo* response = trans->GetResponseInfo(); | 269 const HttpResponseInfo* response = trans->GetResponseInfo(); |
| 270 ASSERT_TRUE(response != nullptr); | 270 ASSERT_TRUE(response != nullptr); |
| 271 ASSERT_TRUE(response->headers.get() != nullptr); | 271 ASSERT_TRUE(response->headers.get() != nullptr); |
| 272 EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine()); | 272 EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine()); |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 } | 359 } |
| 360 | 360 |
| 361 void AddHangingNonAlternateProtocolSocketData() { | 361 void AddHangingNonAlternateProtocolSocketData() { |
| 362 MockConnect hanging_connect(SYNCHRONOUS, ERR_IO_PENDING); | 362 MockConnect hanging_connect(SYNCHRONOUS, ERR_IO_PENDING); |
| 363 hanging_data_.set_connect_data(hanging_connect); | 363 hanging_data_.set_connect_data(hanging_connect); |
| 364 socket_factory_.AddSocketDataProvider(&hanging_data_); | 364 socket_factory_.AddSocketDataProvider(&hanging_data_); |
| 365 } | 365 } |
| 366 | 366 |
| 367 MockClock* clock_; // Owned by QuicStreamFactory after CreateSession. | 367 MockClock* clock_; // Owned by QuicStreamFactory after CreateSession. |
| 368 QuicTestPacketMaker maker_; | 368 QuicTestPacketMaker maker_; |
| 369 scoped_ptr<HttpNetworkSession> session_; | 369 scoped_refptr<HttpNetworkSession> session_; |
| 370 MockClientSocketFactory socket_factory_; | 370 MockClientSocketFactory socket_factory_; |
| 371 MockCryptoClientStreamFactory crypto_client_stream_factory_; | 371 MockCryptoClientStreamFactory crypto_client_stream_factory_; |
| 372 MockHostResolver host_resolver_; | 372 MockHostResolver host_resolver_; |
| 373 MockCertVerifier cert_verifier_; | 373 MockCertVerifier cert_verifier_; |
| 374 TransportSecurityState transport_security_state_; | 374 TransportSecurityState transport_security_state_; |
| 375 scoped_refptr<SSLConfigServiceDefaults> ssl_config_service_; | 375 scoped_refptr<SSLConfigServiceDefaults> ssl_config_service_; |
| 376 scoped_ptr<ProxyService> proxy_service_; | 376 scoped_ptr<ProxyService> proxy_service_; |
| 377 scoped_ptr<HttpAuthHandlerFactory> auth_handler_factory_; | 377 scoped_ptr<HttpAuthHandlerFactory> auth_handler_factory_; |
| 378 MockRandom random_generator_; | 378 MockRandom random_generator_; |
| 379 HttpServerPropertiesImpl http_server_properties_; | 379 HttpServerPropertiesImpl http_server_properties_; |
| (...skipping 1367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1747 | 1747 |
| 1748 request_.url = GURL("https://www.example.org:443"); | 1748 request_.url = GURL("https://www.example.org:443"); |
| 1749 AddHangingNonAlternateProtocolSocketData(); | 1749 AddHangingNonAlternateProtocolSocketData(); |
| 1750 CreateSessionWithNextProtos(); | 1750 CreateSessionWithNextProtos(); |
| 1751 AddQuicAlternateProtocolMapping(MockCryptoClientStream::CONFIRM_HANDSHAKE); | 1751 AddQuicAlternateProtocolMapping(MockCryptoClientStream::CONFIRM_HANDSHAKE); |
| 1752 SendRequestAndExpectQuicResponse("hello!"); | 1752 SendRequestAndExpectQuicResponse("hello!"); |
| 1753 } | 1753 } |
| 1754 | 1754 |
| 1755 } // namespace test | 1755 } // namespace test |
| 1756 } // namespace net | 1756 } // namespace net |
| OLD | NEW |