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 #include <cstddef> | 8 #include <cstddef> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
330 } | 330 } |
331 | 331 |
332 crypto::ECSignatureCreator* MockECSignatureCreatorFactory::Create( | 332 crypto::ECSignatureCreator* MockECSignatureCreatorFactory::Create( |
333 crypto::ECPrivateKey* key) { | 333 crypto::ECPrivateKey* key) { |
334 return new MockECSignatureCreator(key); | 334 return new MockECSignatureCreator(key); |
335 } | 335 } |
336 | 336 |
337 SpdySessionDependencies::SpdySessionDependencies(NextProto protocol) | 337 SpdySessionDependencies::SpdySessionDependencies(NextProto protocol) |
338 : host_resolver(new MockCachingHostResolver), | 338 : host_resolver(new MockCachingHostResolver), |
339 cert_verifier(new MockCertVerifier), | 339 cert_verifier(new MockCertVerifier), |
| 340 channel_id_service(nullptr), |
340 transport_security_state(new TransportSecurityState), | 341 transport_security_state(new TransportSecurityState), |
341 proxy_service(ProxyService::CreateDirect()), | 342 proxy_service(ProxyService::CreateDirect()), |
342 ssl_config_service(new SSLConfigServiceDefaults), | 343 ssl_config_service(new SSLConfigServiceDefaults), |
343 socket_factory(new MockClientSocketFactory), | 344 socket_factory(new MockClientSocketFactory), |
344 http_auth_handler_factory( | 345 http_auth_handler_factory( |
345 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), | 346 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), |
346 enable_ip_pooling(true), | 347 enable_ip_pooling(true), |
347 enable_compression(false), | 348 enable_compression(false), |
348 enable_ping(false), | 349 enable_ping(false), |
349 enable_user_alternate_protocol_ports(false), | 350 enable_user_alternate_protocol_ports(false), |
(...skipping 15 matching lines...) Expand all Loading... |
365 // lookups allows the test to shutdown cleanly. Until we have | 366 // lookups allows the test to shutdown cleanly. Until we have |
366 // cancellable TCPConnectJobs, use synchronous lookups. | 367 // cancellable TCPConnectJobs, use synchronous lookups. |
367 host_resolver->set_synchronous_mode(true); | 368 host_resolver->set_synchronous_mode(true); |
368 } | 369 } |
369 | 370 |
370 SpdySessionDependencies::SpdySessionDependencies( | 371 SpdySessionDependencies::SpdySessionDependencies( |
371 NextProto protocol, | 372 NextProto protocol, |
372 scoped_ptr<ProxyService> proxy_service) | 373 scoped_ptr<ProxyService> proxy_service) |
373 : host_resolver(new MockHostResolver), | 374 : host_resolver(new MockHostResolver), |
374 cert_verifier(new MockCertVerifier), | 375 cert_verifier(new MockCertVerifier), |
| 376 channel_id_service(nullptr), |
375 transport_security_state(new TransportSecurityState), | 377 transport_security_state(new TransportSecurityState), |
376 proxy_service(std::move(proxy_service)), | 378 proxy_service(std::move(proxy_service)), |
377 ssl_config_service(new SSLConfigServiceDefaults), | 379 ssl_config_service(new SSLConfigServiceDefaults), |
378 socket_factory(new MockClientSocketFactory), | 380 socket_factory(new MockClientSocketFactory), |
379 http_auth_handler_factory( | 381 http_auth_handler_factory( |
380 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), | 382 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), |
381 enable_ip_pooling(true), | 383 enable_ip_pooling(true), |
382 enable_compression(false), | 384 enable_compression(false), |
383 enable_ping(false), | 385 enable_ping(false), |
384 enable_user_alternate_protocol_ports(false), | 386 enable_user_alternate_protocol_ports(false), |
(...skipping 24 matching lines...) Expand all Loading... |
409 | 411 |
410 // static | 412 // static |
411 HttpNetworkSession::Params SpdySessionDependencies::CreateSessionParams( | 413 HttpNetworkSession::Params SpdySessionDependencies::CreateSessionParams( |
412 SpdySessionDependencies* session_deps) { | 414 SpdySessionDependencies* session_deps) { |
413 DCHECK(next_proto_is_spdy(session_deps->protocol)) << | 415 DCHECK(next_proto_is_spdy(session_deps->protocol)) << |
414 "Invalid protocol: " << session_deps->protocol; | 416 "Invalid protocol: " << session_deps->protocol; |
415 | 417 |
416 HttpNetworkSession::Params params; | 418 HttpNetworkSession::Params params; |
417 params.host_resolver = session_deps->host_resolver.get(); | 419 params.host_resolver = session_deps->host_resolver.get(); |
418 params.cert_verifier = session_deps->cert_verifier.get(); | 420 params.cert_verifier = session_deps->cert_verifier.get(); |
| 421 params.channel_id_service = session_deps->channel_id_service.get(); |
419 params.transport_security_state = | 422 params.transport_security_state = |
420 session_deps->transport_security_state.get(); | 423 session_deps->transport_security_state.get(); |
421 params.proxy_service = session_deps->proxy_service.get(); | 424 params.proxy_service = session_deps->proxy_service.get(); |
422 params.ssl_config_service = session_deps->ssl_config_service.get(); | 425 params.ssl_config_service = session_deps->ssl_config_service.get(); |
423 params.http_auth_handler_factory = | 426 params.http_auth_handler_factory = |
424 session_deps->http_auth_handler_factory.get(); | 427 session_deps->http_auth_handler_factory.get(); |
425 params.http_server_properties = | 428 params.http_server_properties = |
426 session_deps->http_server_properties.GetWeakPtr(); | 429 session_deps->http_server_properties.GetWeakPtr(); |
427 params.enable_spdy_compression = session_deps->enable_compression; | 430 params.enable_spdy_compression = session_deps->enable_compression; |
428 params.enable_spdy_ping_based_connection_checking = session_deps->enable_ping; | 431 params.enable_spdy_ping_based_connection_checking = session_deps->enable_ping; |
(...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1341 } | 1344 } |
1342 } | 1345 } |
1343 | 1346 |
1344 void SpdyTestUtil::SetPriority(RequestPriority priority, | 1347 void SpdyTestUtil::SetPriority(RequestPriority priority, |
1345 SpdySynStreamIR* ir) const { | 1348 SpdySynStreamIR* ir) const { |
1346 ir->set_priority(ConvertRequestPriorityToSpdyPriority( | 1349 ir->set_priority(ConvertRequestPriorityToSpdyPriority( |
1347 priority, spdy_version())); | 1350 priority, spdy_version())); |
1348 } | 1351 } |
1349 | 1352 |
1350 } // namespace net | 1353 } // namespace net |
OLD | NEW |