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 <memory> | 5 #include <memory> |
6 #include <ostream> | 6 #include <ostream> |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
406 QuicPacketNumber packet_number, | 406 QuicPacketNumber packet_number, |
407 QuicStreamId stream_id, | 407 QuicStreamId stream_id, |
408 bool should_include_version, | 408 bool should_include_version, |
409 bool fin, | 409 bool fin, |
410 SpdyHeaderBlock headers, | 410 SpdyHeaderBlock headers, |
411 QuicStreamOffset* offset) { | 411 QuicStreamOffset* offset) { |
412 SpdyPriority priority = | 412 SpdyPriority priority = |
413 ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY); | 413 ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY); |
414 return client_maker_.MakeRequestHeadersPacketWithOffsetTracking( | 414 return client_maker_.MakeRequestHeadersPacketWithOffsetTracking( |
415 packet_number, stream_id, should_include_version, fin, priority, | 415 packet_number, stream_id, should_include_version, fin, priority, |
416 headers, offset); | 416 std::move(headers), offset); |
417 } | 417 } |
418 | 418 |
419 std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket( | 419 std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket( |
420 QuicPacketNumber packet_number, | 420 QuicPacketNumber packet_number, |
421 QuicStreamId stream_id, | 421 QuicStreamId stream_id, |
422 bool should_include_version, | 422 bool should_include_version, |
423 bool fin, | 423 bool fin, |
424 SpdyHeaderBlock headers, | 424 SpdyHeaderBlock headers, |
425 QuicStreamOffset* offset, | 425 QuicStreamOffset* offset, |
426 QuicTestPacketMaker* maker) { | 426 QuicTestPacketMaker* maker) { |
427 SpdyPriority priority = | 427 SpdyPriority priority = |
428 ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY); | 428 ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY); |
429 return client_maker_.MakeRequestHeadersPacketWithOffsetTracking( | 429 return client_maker_.MakeRequestHeadersPacketWithOffsetTracking( |
430 packet_number, stream_id, should_include_version, fin, priority, | 430 packet_number, stream_id, should_include_version, fin, priority, |
431 headers, offset); | 431 std::move(headers), offset); |
432 } | 432 } |
433 | 433 |
434 std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket( | 434 std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket( |
435 QuicPacketNumber packet_number, | 435 QuicPacketNumber packet_number, |
436 QuicStreamId stream_id, | 436 QuicStreamId stream_id, |
437 bool should_include_version, | 437 bool should_include_version, |
438 bool fin, | 438 bool fin, |
439 SpdyHeaderBlock headers) { | 439 SpdyHeaderBlock headers) { |
440 return ConstructClientRequestHeadersPacket( | 440 return ConstructClientRequestHeadersPacket( |
441 packet_number, stream_id, should_include_version, fin, | 441 packet_number, stream_id, should_include_version, fin, |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
477 } | 477 } |
478 | 478 |
479 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( | 479 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( |
480 QuicPacketNumber packet_number, | 480 QuicPacketNumber packet_number, |
481 QuicStreamId stream_id, | 481 QuicStreamId stream_id, |
482 bool should_include_version, | 482 bool should_include_version, |
483 bool fin, | 483 bool fin, |
484 SpdyHeaderBlock headers, | 484 SpdyHeaderBlock headers, |
485 QuicStreamOffset* offset) { | 485 QuicStreamOffset* offset) { |
486 return server_maker_.MakeResponseHeadersPacketWithOffsetTracking( | 486 return server_maker_.MakeResponseHeadersPacketWithOffsetTracking( |
487 packet_number, stream_id, should_include_version, fin, headers, offset); | 487 packet_number, stream_id, should_include_version, fin, |
| 488 std::move(headers), offset); |
488 } | 489 } |
489 | 490 |
490 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( | 491 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( |
491 QuicPacketNumber packet_number, | 492 QuicPacketNumber packet_number, |
492 QuicStreamId stream_id, | 493 QuicStreamId stream_id, |
493 bool should_include_version, | 494 bool should_include_version, |
494 bool fin, | 495 bool fin, |
495 SpdyHeaderBlock headers, | 496 SpdyHeaderBlock headers, |
496 QuicStreamOffset* offset, | 497 QuicStreamOffset* offset, |
497 QuicTestPacketMaker* maker) { | 498 QuicTestPacketMaker* maker) { |
498 return server_maker_.MakeResponseHeadersPacketWithOffsetTracking( | 499 return server_maker_.MakeResponseHeadersPacketWithOffsetTracking( |
499 packet_number, stream_id, should_include_version, fin, headers, offset); | 500 packet_number, stream_id, should_include_version, fin, |
| 501 std::move(headers), offset); |
500 } | 502 } |
501 | 503 |
502 void CreateSession() { | 504 void CreateSession() { |
503 params_.enable_quic = true; | 505 params_.enable_quic = true; |
504 params_.quic_clock = clock_; | 506 params_.quic_clock = clock_; |
505 params_.quic_random = &random_generator_; | 507 params_.quic_random = &random_generator_; |
506 params_.client_socket_factory = &socket_factory_; | 508 params_.client_socket_factory = &socket_factory_; |
507 params_.quic_crypto_client_stream_factory = &crypto_client_stream_factory_; | 509 params_.quic_crypto_client_stream_factory = &crypto_client_stream_factory_; |
508 params_.host_resolver = &host_resolver_; | 510 params_.host_resolver = &host_resolver_; |
509 params_.cert_verifier = &cert_verifier_; | 511 params_.cert_verifier = &cert_verifier_; |
(...skipping 2151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2661 AddHangingSocketData(); | 2663 AddHangingSocketData(); |
2662 | 2664 |
2663 SendRequestAndExpectQuicResponse(origin1_); | 2665 SendRequestAndExpectQuicResponse(origin1_); |
2664 SendRequestAndExpectQuicResponse(origin2_); | 2666 SendRequestAndExpectQuicResponse(origin2_); |
2665 | 2667 |
2666 EXPECT_TRUE(AllDataConsumed()); | 2668 EXPECT_TRUE(AllDataConsumed()); |
2667 } | 2669 } |
2668 | 2670 |
2669 } // namespace test | 2671 } // namespace test |
2670 } // namespace net | 2672 } // namespace net |
OLD | NEW |