OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "net/spdy/spdy_test_util_common.h" | 5 #include "net/spdy/spdy_test_util_common.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <cstddef> | 9 #include <cstddef> |
10 #include <memory> | 10 #include <memory> |
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
461 std::unique_ptr<HostResolver>(new MockHostResolver)); | 461 std::unique_ptr<HostResolver>(new MockHostResolver)); |
462 storage_.set_cert_verifier(base::WrapUnique(new MockCertVerifier)); | 462 storage_.set_cert_verifier(base::WrapUnique(new MockCertVerifier)); |
463 storage_.set_transport_security_state( | 463 storage_.set_transport_security_state( |
464 base::WrapUnique(new TransportSecurityState)); | 464 base::WrapUnique(new TransportSecurityState)); |
465 storage_.set_proxy_service(ProxyService::CreateDirect()); | 465 storage_.set_proxy_service(ProxyService::CreateDirect()); |
466 storage_.set_ssl_config_service(new SSLConfigServiceDefaults); | 466 storage_.set_ssl_config_service(new SSLConfigServiceDefaults); |
467 storage_.set_http_auth_handler_factory( | 467 storage_.set_http_auth_handler_factory( |
468 HttpAuthHandlerFactory::CreateDefault(host_resolver())); | 468 HttpAuthHandlerFactory::CreateDefault(host_resolver())); |
469 storage_.set_http_server_properties( | 469 storage_.set_http_server_properties( |
470 std::unique_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); | 470 std::unique_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); |
471 storage_.set_job_factory(base::WrapUnique(new URLRequestJobFactoryImpl())); | 471 storage_.set_job_factory( |
| 472 URLRequestJobFactoryImpl::CreateWithDefaultProtocolHandlers()); |
472 HttpNetworkSession::Params params; | 473 HttpNetworkSession::Params params; |
473 params.client_socket_factory = &socket_factory_; | 474 params.client_socket_factory = &socket_factory_; |
474 params.host_resolver = host_resolver(); | 475 params.host_resolver = host_resolver(); |
475 params.cert_verifier = cert_verifier(); | 476 params.cert_verifier = cert_verifier(); |
476 params.transport_security_state = transport_security_state(); | 477 params.transport_security_state = transport_security_state(); |
477 params.proxy_service = proxy_service(); | 478 params.proxy_service = proxy_service(); |
478 params.ssl_config_service = ssl_config_service(); | 479 params.ssl_config_service = ssl_config_service(); |
479 params.http_auth_handler_factory = http_auth_handler_factory(); | 480 params.http_auth_handler_factory = http_auth_handler_factory(); |
480 params.enable_spdy_ping_based_connection_checking = false; | 481 params.enable_spdy_ping_based_connection_checking = false; |
481 params.spdy_default_protocol = protocol; | 482 params.spdy_default_protocol = protocol; |
(...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1314 } | 1315 } |
1315 } | 1316 } |
1316 | 1317 |
1317 void SpdyTestUtil::SetPriority(RequestPriority priority, | 1318 void SpdyTestUtil::SetPriority(RequestPriority priority, |
1318 SpdySynStreamIR* ir) const { | 1319 SpdySynStreamIR* ir) const { |
1319 ir->set_priority(ConvertRequestPriorityToSpdyPriority( | 1320 ir->set_priority(ConvertRequestPriorityToSpdyPriority( |
1320 priority, spdy_version())); | 1321 priority, spdy_version())); |
1321 } | 1322 } |
1322 | 1323 |
1323 } // namespace net | 1324 } // namespace net |
OLD | NEW |