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

Side by Side Diff: net/quic/quic_network_transaction_unittest.cc

Issue 19858003: * Removed QuicTag kQuicVersion1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed comments from rch Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « net/quic/quic_http_stream_test.cc ('k') | net/quic/quic_packet_creator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/compiler_specific.h" 6 #include "base/compiler_specific.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "net/base/capturing_net_log.h" 9 #include "net/base/capturing_net_log.h"
10 #include "net/base/net_log_unittest.h" 10 #include "net/base/net_log_unittest.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 header.fec_flag = false; 134 header.fec_flag = false;
135 header.fec_group = 0; 135 header.fec_group = 0;
136 136
137 QuicAckFrame ack(largest_received, QuicTime::Zero(), least_unacked); 137 QuicAckFrame ack(largest_received, QuicTime::Zero(), least_unacked);
138 138
139 QuicCongestionFeedbackFrame feedback; 139 QuicCongestionFeedbackFrame feedback;
140 feedback.type = kTCP; 140 feedback.type = kTCP;
141 feedback.tcp.accumulated_number_of_lost_packets = 0; 141 feedback.tcp.accumulated_number_of_lost_packets = 0;
142 feedback.tcp.receive_window = 256000; 142 feedback.tcp.receive_window = 256000;
143 143
144 QuicFramer framer(kQuicVersion1, QuicTime::Zero(), false); 144 QuicFramer framer(QuicVersionMax(), QuicTime::Zero(), false);
145 QuicFrames frames; 145 QuicFrames frames;
146 frames.push_back(QuicFrame(&ack)); 146 frames.push_back(QuicFrame(&ack));
147 frames.push_back(QuicFrame(&feedback)); 147 frames.push_back(QuicFrame(&feedback));
148 scoped_ptr<QuicPacket> packet( 148 scoped_ptr<QuicPacket> packet(
149 framer.ConstructFrameDataPacket(header, frames).packet); 149 framer.ConstructFrameDataPacket(header, frames).packet);
150 return scoped_ptr<QuicEncryptedPacket>(framer.EncryptPacket( 150 return scoped_ptr<QuicEncryptedPacket>(framer.EncryptPacket(
151 ENCRYPTION_NONE, header.packet_sequence_number, *packet)); 151 ENCRYPTION_NONE, header.packet_sequence_number, *packet));
152 } 152 }
153 153
154 std::string GetRequestString(const std::string& method, 154 std::string GetRequestString(const std::string& method,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 QuicStreamOffset offset, 186 QuicStreamOffset offset,
187 base::StringPiece data) { 187 base::StringPiece data) {
188 InitializeHeader(sequence_number, should_include_version); 188 InitializeHeader(sequence_number, should_include_version);
189 QuicStreamFrame frame(stream_id, fin, offset, data); 189 QuicStreamFrame frame(stream_id, fin, offset, data);
190 return ConstructPacket(header_, QuicFrame(&frame)).release(); 190 return ConstructPacket(header_, QuicFrame(&frame)).release();
191 } 191 }
192 192
193 scoped_ptr<QuicEncryptedPacket> ConstructPacket( 193 scoped_ptr<QuicEncryptedPacket> ConstructPacket(
194 const QuicPacketHeader& header, 194 const QuicPacketHeader& header,
195 const QuicFrame& frame) { 195 const QuicFrame& frame) {
196 QuicFramer framer(kQuicVersion1, QuicTime::Zero(), false); 196 QuicFramer framer(QuicVersionMax(), QuicTime::Zero(), false);
197 QuicFrames frames; 197 QuicFrames frames;
198 frames.push_back(frame); 198 frames.push_back(frame);
199 scoped_ptr<QuicPacket> packet( 199 scoped_ptr<QuicPacket> packet(
200 framer.ConstructFrameDataPacket(header, frames).packet); 200 framer.ConstructFrameDataPacket(header, frames).packet);
201 return scoped_ptr<QuicEncryptedPacket>(framer.EncryptPacket( 201 return scoped_ptr<QuicEncryptedPacket>(framer.EncryptPacket(
202 ENCRYPTION_NONE, header.packet_sequence_number, *packet)); 202 ENCRYPTION_NONE, header.packet_sequence_number, *packet));
203 } 203 }
204 204
205 void InitializeHeader(QuicPacketSequenceNumber sequence_number, 205 void InitializeHeader(QuicPacketSequenceNumber sequence_number,
206 bool should_include_version) { 206 bool should_include_version) {
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 743
744 CreateSession(); 744 CreateSession();
745 745
746 AddQuicAlternateProtocolMapping(MockCryptoClientStream::COLD_START); 746 AddQuicAlternateProtocolMapping(MockCryptoClientStream::COLD_START);
747 SendRequestAndExpectHttpResponse("hello from http"); 747 SendRequestAndExpectHttpResponse("hello from http");
748 ExpectBrokenAlternateProtocolMapping(); 748 ExpectBrokenAlternateProtocolMapping();
749 } 749 }
750 750
751 } // namespace test 751 } // namespace test
752 } // namespace net 752 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_http_stream_test.cc ('k') | net/quic/quic_packet_creator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698