Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(428)

Side by Side Diff: net/quic/chromium/quic_test_packet_maker.cc

Issue 2838113002: Simplify QUIC tests by adding a MakeInitialSettingsPacket method (Closed)
Patch Set: Rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/quic/chromium/quic_test_packet_maker.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/quic/chromium/quic_test_packet_maker.h" 5 #include "net/quic/chromium/quic_test_packet_maker.h"
6 6
7 #include <list> 7 #include <list>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 644
645 void QuicTestPacketMaker::InitializeHeader(QuicPacketNumber packet_number, 645 void QuicTestPacketMaker::InitializeHeader(QuicPacketNumber packet_number,
646 bool should_include_version) { 646 bool should_include_version) {
647 header_.public_header.connection_id = connection_id_; 647 header_.public_header.connection_id = connection_id_;
648 header_.public_header.reset_flag = false; 648 header_.public_header.reset_flag = false;
649 header_.public_header.version_flag = should_include_version; 649 header_.public_header.version_flag = should_include_version;
650 header_.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER; 650 header_.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER;
651 header_.packet_number = packet_number; 651 header_.packet_number = packet_number;
652 } 652 }
653 653
654 std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeSettingsPacket( 654 std::unique_ptr<QuicReceivedPacket>
655 QuicPacketNumber packet_number, 655 QuicTestPacketMaker::MakeInitialSettingsPacket(QuicPacketNumber packet_number,
656 SpdySettingsIds id, 656 QuicStreamOffset* offset) {
657 size_t value,
658 bool should_include_version,
659 QuicStreamOffset* offset) {
660 std::string unused_data; 657 std::string unused_data;
661 return MakeSettingsPacketAndSaveData( 658 return MakeInitialSettingsPacketAndSaveData(packet_number, offset,
662 packet_number, id, value, should_include_version, offset, &unused_data); 659 &unused_data);
663 } 660 }
664 661
665 std::unique_ptr<QuicReceivedPacket> 662 std::unique_ptr<QuicReceivedPacket>
666 QuicTestPacketMaker::MakeSettingsPacketAndSaveData( 663 QuicTestPacketMaker::MakeInitialSettingsPacketAndSaveData(
667 QuicPacketNumber packet_number, 664 QuicPacketNumber packet_number,
668 SpdySettingsIds id,
669 size_t value,
670 bool should_include_version,
671 QuicStreamOffset* offset, 665 QuicStreamOffset* offset,
672 std::string* stream_data) { 666 std::string* stream_data) {
673 SpdySettingsIR settings_frame; 667 SpdySettingsIR settings_frame;
674 settings_frame.AddSetting(id, value); 668 settings_frame.AddSetting(SETTINGS_MAX_HEADER_LIST_SIZE,
669 kDefaultMaxUncompressedHeaderSize);
675 SpdySerializedFrame spdy_frame( 670 SpdySerializedFrame spdy_frame(
676 spdy_request_framer_.SerializeFrame(settings_frame)); 671 spdy_request_framer_.SerializeFrame(settings_frame));
677 InitializeHeader(packet_number, should_include_version); 672 InitializeHeader(packet_number, /*should_include_version*/ true);
678 *stream_data = std::string(spdy_frame.data(), spdy_frame.size()); 673 *stream_data = std::string(spdy_frame.data(), spdy_frame.size());
679 if (offset != nullptr) { 674 if (offset != nullptr) {
680 QuicStreamFrame quic_frame( 675 QuicStreamFrame quic_frame(
681 kHeadersStreamId, false, *offset, 676 kHeadersStreamId, false, *offset,
682 QuicStringPiece(spdy_frame.data(), spdy_frame.size())); 677 QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
683 *offset += spdy_frame.size(); 678 *offset += spdy_frame.size();
684 return MakePacket(header_, QuicFrame(&quic_frame)); 679 return MakePacket(header_, QuicFrame(&quic_frame));
685 } 680 }
686 QuicStreamFrame quic_frame( 681 QuicStreamFrame quic_frame(
687 kHeadersStreamId, false, 0, 682 kHeadersStreamId, false, 0,
688 QuicStringPiece(spdy_frame.data(), spdy_frame.size())); 683 QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
689 return MakePacket(header_, QuicFrame(&quic_frame)); 684 return MakePacket(header_, QuicFrame(&quic_frame));
690 } 685 }
691 686
692 } // namespace test 687 } // namespace test
693 } // namespace net 688 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/chromium/quic_test_packet_maker.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698