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 | 10 |
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
358 } | 358 } |
359 | 359 |
360 crypto::ECSignatureCreator* MockECSignatureCreatorFactory::Create( | 360 crypto::ECSignatureCreator* MockECSignatureCreatorFactory::Create( |
361 crypto::ECPrivateKey* key) { | 361 crypto::ECPrivateKey* key) { |
362 return new MockECSignatureCreator(key); | 362 return new MockECSignatureCreator(key); |
363 } | 363 } |
364 | 364 |
365 SpdySessionDependencies::SpdySessionDependencies(NextProto protocol) | 365 SpdySessionDependencies::SpdySessionDependencies(NextProto protocol) |
366 : host_resolver(new MockCachingHostResolver), | 366 : host_resolver(new MockCachingHostResolver), |
367 cert_verifier(new MockCertVerifier), | 367 cert_verifier(new MockCertVerifier), |
| 368 channel_id_service(nullptr), |
368 transport_security_state(new TransportSecurityState), | 369 transport_security_state(new TransportSecurityState), |
369 proxy_service(ProxyService::CreateDirect()), | 370 proxy_service(ProxyService::CreateDirect()), |
370 ssl_config_service(new SSLConfigServiceDefaults), | 371 ssl_config_service(new SSLConfigServiceDefaults), |
371 socket_factory(new MockClientSocketFactory), | 372 socket_factory(new MockClientSocketFactory), |
372 deterministic_socket_factory(new DeterministicMockClientSocketFactory), | 373 deterministic_socket_factory(new DeterministicMockClientSocketFactory), |
373 http_auth_handler_factory( | 374 http_auth_handler_factory( |
374 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), | 375 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), |
375 enable_ip_pooling(true), | 376 enable_ip_pooling(true), |
376 enable_compression(false), | 377 enable_compression(false), |
377 enable_ping(false), | 378 enable_ping(false), |
(...skipping 15 matching lines...) Expand all Loading... |
393 // lookups allows the test to shutdown cleanly. Until we have | 394 // lookups allows the test to shutdown cleanly. Until we have |
394 // cancellable TCPConnectJobs, use synchronous lookups. | 395 // cancellable TCPConnectJobs, use synchronous lookups. |
395 host_resolver->set_synchronous_mode(true); | 396 host_resolver->set_synchronous_mode(true); |
396 } | 397 } |
397 | 398 |
398 SpdySessionDependencies::SpdySessionDependencies( | 399 SpdySessionDependencies::SpdySessionDependencies( |
399 NextProto protocol, | 400 NextProto protocol, |
400 scoped_ptr<ProxyService> proxy_service) | 401 scoped_ptr<ProxyService> proxy_service) |
401 : host_resolver(new MockHostResolver), | 402 : host_resolver(new MockHostResolver), |
402 cert_verifier(new MockCertVerifier), | 403 cert_verifier(new MockCertVerifier), |
| 404 channel_id_service(nullptr), |
403 transport_security_state(new TransportSecurityState), | 405 transport_security_state(new TransportSecurityState), |
404 proxy_service(proxy_service.Pass()), | 406 proxy_service(proxy_service.Pass()), |
405 ssl_config_service(new SSLConfigServiceDefaults), | 407 ssl_config_service(new SSLConfigServiceDefaults), |
406 socket_factory(new MockClientSocketFactory), | 408 socket_factory(new MockClientSocketFactory), |
407 deterministic_socket_factory(new DeterministicMockClientSocketFactory), | 409 deterministic_socket_factory(new DeterministicMockClientSocketFactory), |
408 http_auth_handler_factory( | 410 http_auth_handler_factory( |
409 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), | 411 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), |
410 enable_ip_pooling(true), | 412 enable_ip_pooling(true), |
411 enable_compression(false), | 413 enable_compression(false), |
412 enable_ping(false), | 414 enable_ping(false), |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
450 | 452 |
451 // static | 453 // static |
452 HttpNetworkSession::Params SpdySessionDependencies::CreateSessionParams( | 454 HttpNetworkSession::Params SpdySessionDependencies::CreateSessionParams( |
453 SpdySessionDependencies* session_deps) { | 455 SpdySessionDependencies* session_deps) { |
454 DCHECK(next_proto_is_spdy(session_deps->protocol)) << | 456 DCHECK(next_proto_is_spdy(session_deps->protocol)) << |
455 "Invalid protocol: " << session_deps->protocol; | 457 "Invalid protocol: " << session_deps->protocol; |
456 | 458 |
457 HttpNetworkSession::Params params; | 459 HttpNetworkSession::Params params; |
458 params.host_resolver = session_deps->host_resolver.get(); | 460 params.host_resolver = session_deps->host_resolver.get(); |
459 params.cert_verifier = session_deps->cert_verifier.get(); | 461 params.cert_verifier = session_deps->cert_verifier.get(); |
| 462 params.channel_id_service = session_deps->channel_id_service.get(); |
460 params.transport_security_state = | 463 params.transport_security_state = |
461 session_deps->transport_security_state.get(); | 464 session_deps->transport_security_state.get(); |
462 params.proxy_service = session_deps->proxy_service.get(); | 465 params.proxy_service = session_deps->proxy_service.get(); |
463 params.ssl_config_service = session_deps->ssl_config_service.get(); | 466 params.ssl_config_service = session_deps->ssl_config_service.get(); |
464 params.http_auth_handler_factory = | 467 params.http_auth_handler_factory = |
465 session_deps->http_auth_handler_factory.get(); | 468 session_deps->http_auth_handler_factory.get(); |
466 params.http_server_properties = | 469 params.http_server_properties = |
467 session_deps->http_server_properties.GetWeakPtr(); | 470 session_deps->http_server_properties.GetWeakPtr(); |
468 params.enable_spdy_compression = session_deps->enable_compression; | 471 params.enable_spdy_compression = session_deps->enable_compression; |
469 params.enable_spdy_ping_based_connection_checking = session_deps->enable_ping; | 472 params.enable_spdy_ping_based_connection_checking = session_deps->enable_ping; |
(...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1356 } | 1359 } |
1357 } | 1360 } |
1358 | 1361 |
1359 void SpdyTestUtil::SetPriority(RequestPriority priority, | 1362 void SpdyTestUtil::SetPriority(RequestPriority priority, |
1360 SpdySynStreamIR* ir) const { | 1363 SpdySynStreamIR* ir) const { |
1361 ir->set_priority(ConvertRequestPriorityToSpdyPriority( | 1364 ir->set_priority(ConvertRequestPriorityToSpdyPriority( |
1362 priority, spdy_version())); | 1365 priority, spdy_version())); |
1363 } | 1366 } |
1364 | 1367 |
1365 } // namespace net | 1368 } // namespace net |
OLD | NEW |