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 <cstddef> | 7 #include <cstddef> |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
379 | 379 |
380 // Note: The CancelledTransaction test does cleanup by running all | 380 // Note: The CancelledTransaction test does cleanup by running all |
381 // tasks in the message loop (RunAllPending). Unfortunately, that | 381 // tasks in the message loop (RunAllPending). Unfortunately, that |
382 // doesn't clean up tasks on the host resolver thread; and | 382 // doesn't clean up tasks on the host resolver thread; and |
383 // TCPConnectJob is currently not cancellable. Using synchronous | 383 // TCPConnectJob is currently not cancellable. Using synchronous |
384 // lookups allows the test to shutdown cleanly. Until we have | 384 // lookups allows the test to shutdown cleanly. Until we have |
385 // cancellable TCPConnectJobs, use synchronous lookups. | 385 // cancellable TCPConnectJobs, use synchronous lookups. |
386 host_resolver->set_synchronous_mode(true); | 386 host_resolver->set_synchronous_mode(true); |
387 } | 387 } |
388 | 388 |
389 SpdySessionDependencies::SpdySessionDependencies(NextProto protocol, | 389 SpdySessionDependencies::SpdySessionDependencies( |
390 ProxyService* proxy_service) | 390 NextProto protocol, |
| 391 scoped_ptr<ProxyService> proxy_service) |
391 : host_resolver(new MockHostResolver), | 392 : host_resolver(new MockHostResolver), |
392 cert_verifier(new MockCertVerifier), | 393 cert_verifier(new MockCertVerifier), |
393 transport_security_state(new TransportSecurityState), | 394 transport_security_state(new TransportSecurityState), |
394 proxy_service(proxy_service), | 395 proxy_service(proxy_service.Pass()), |
395 ssl_config_service(new SSLConfigServiceDefaults), | 396 ssl_config_service(new SSLConfigServiceDefaults), |
396 socket_factory(new MockClientSocketFactory), | 397 socket_factory(new MockClientSocketFactory), |
397 deterministic_socket_factory(new DeterministicMockClientSocketFactory), | 398 deterministic_socket_factory(new DeterministicMockClientSocketFactory), |
398 http_auth_handler_factory( | 399 http_auth_handler_factory( |
399 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), | 400 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), |
400 enable_ip_pooling(true), | 401 enable_ip_pooling(true), |
401 enable_compression(false), | 402 enable_compression(false), |
402 enable_ping(false), | 403 enable_ping(false), |
403 enable_user_alternate_protocol_ports(false), | 404 enable_user_alternate_protocol_ports(false), |
404 protocol(protocol), | 405 protocol(protocol), |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
469 params.use_alternative_services = session_deps->use_alternative_services; | 470 params.use_alternative_services = session_deps->use_alternative_services; |
470 params.net_log = session_deps->net_log; | 471 params.net_log = session_deps->net_log; |
471 return params; | 472 return params; |
472 } | 473 } |
473 | 474 |
474 SpdyURLRequestContext::SpdyURLRequestContext(NextProto protocol) | 475 SpdyURLRequestContext::SpdyURLRequestContext(NextProto protocol) |
475 : storage_(this) { | 476 : storage_(this) { |
476 DCHECK(next_proto_is_spdy(protocol)) << "Invalid protocol: " << protocol; | 477 DCHECK(next_proto_is_spdy(protocol)) << "Invalid protocol: " << protocol; |
477 | 478 |
478 storage_.set_host_resolver(scoped_ptr<HostResolver>(new MockHostResolver)); | 479 storage_.set_host_resolver(scoped_ptr<HostResolver>(new MockHostResolver)); |
479 storage_.set_cert_verifier(new MockCertVerifier); | 480 storage_.set_cert_verifier(make_scoped_ptr(new MockCertVerifier).Pass()); |
480 storage_.set_transport_security_state(new TransportSecurityState); | 481 storage_.set_transport_security_state( |
| 482 make_scoped_ptr(new TransportSecurityState)); |
481 storage_.set_proxy_service(ProxyService::CreateDirect()); | 483 storage_.set_proxy_service(ProxyService::CreateDirect()); |
482 storage_.set_ssl_config_service(new SSLConfigServiceDefaults); | 484 storage_.set_ssl_config_service(new SSLConfigServiceDefaults); |
483 storage_.set_http_auth_handler_factory(HttpAuthHandlerFactory::CreateDefault( | 485 storage_.set_http_auth_handler_factory( |
484 host_resolver())); | 486 HttpAuthHandlerFactory::CreateDefault(host_resolver())); |
485 storage_.set_http_server_properties( | 487 storage_.set_http_server_properties( |
486 scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); | 488 scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); |
487 storage_.set_job_factory(new URLRequestJobFactoryImpl()); | 489 storage_.set_job_factory( |
| 490 make_scoped_ptr(new URLRequestJobFactoryImpl()).Pass()); |
488 HttpNetworkSession::Params params; | 491 HttpNetworkSession::Params params; |
489 params.client_socket_factory = &socket_factory_; | 492 params.client_socket_factory = &socket_factory_; |
490 params.host_resolver = host_resolver(); | 493 params.host_resolver = host_resolver(); |
491 params.cert_verifier = cert_verifier(); | 494 params.cert_verifier = cert_verifier(); |
492 params.transport_security_state = transport_security_state(); | 495 params.transport_security_state = transport_security_state(); |
493 params.proxy_service = proxy_service(); | 496 params.proxy_service = proxy_service(); |
494 params.ssl_config_service = ssl_config_service(); | 497 params.ssl_config_service = ssl_config_service(); |
495 params.http_auth_handler_factory = http_auth_handler_factory(); | 498 params.http_auth_handler_factory = http_auth_handler_factory(); |
496 params.network_delegate = network_delegate(); | 499 params.network_delegate = network_delegate(); |
497 params.enable_spdy_compression = false; | 500 params.enable_spdy_compression = false; |
498 params.enable_spdy_ping_based_connection_checking = false; | 501 params.enable_spdy_ping_based_connection_checking = false; |
499 params.spdy_default_protocol = protocol; | 502 params.spdy_default_protocol = protocol; |
500 params.http_server_properties = http_server_properties(); | 503 params.http_server_properties = http_server_properties(); |
501 scoped_refptr<HttpNetworkSession> network_session( | 504 scoped_refptr<HttpNetworkSession> network_session( |
502 new HttpNetworkSession(params)); | 505 new HttpNetworkSession(params)); |
503 SpdySessionPoolPeer pool_peer(network_session->spdy_session_pool()); | 506 SpdySessionPoolPeer pool_peer(network_session->spdy_session_pool()); |
504 pool_peer.SetEnableSendingInitialData(false); | 507 pool_peer.SetEnableSendingInitialData(false); |
505 storage_.set_http_transaction_factory(new HttpCache( | 508 storage_.set_http_transaction_factory( |
506 network_session.get(), HttpCache::DefaultBackend::InMemory(0))); | 509 make_scoped_ptr(new HttpCache(network_session.get(), |
| 510 HttpCache::DefaultBackend::InMemory(0))) |
| 511 .Pass()); |
507 } | 512 } |
508 | 513 |
509 SpdyURLRequestContext::~SpdyURLRequestContext() { | 514 SpdyURLRequestContext::~SpdyURLRequestContext() { |
510 AssertNoURLRequests(); | 515 AssertNoURLRequests(); |
511 } | 516 } |
512 | 517 |
513 bool HasSpdySession(SpdySessionPool* pool, const SpdySessionKey& key) { | 518 bool HasSpdySession(SpdySessionPool* pool, const SpdySessionKey& key) { |
514 return pool->FindAvailableSession(key, BoundNetLog()) != NULL; | 519 return pool->FindAvailableSession(key, BoundNetLog()) != NULL; |
515 } | 520 } |
516 | 521 |
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1338 } | 1343 } |
1339 } | 1344 } |
1340 | 1345 |
1341 void SpdyTestUtil::SetPriority(RequestPriority priority, | 1346 void SpdyTestUtil::SetPriority(RequestPriority priority, |
1342 SpdySynStreamIR* ir) const { | 1347 SpdySynStreamIR* ir) const { |
1343 ir->set_priority(ConvertRequestPriorityToSpdyPriority( | 1348 ir->set_priority(ConvertRequestPriorityToSpdyPriority( |
1344 priority, spdy_version())); | 1349 priority, spdy_version())); |
1345 } | 1350 } |
1346 | 1351 |
1347 } // namespace net | 1352 } // namespace net |
OLD | NEW |