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

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

Issue 19858003: * Removed QuicTag kQuicVersion1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compiler errors 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
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 "net/quic/quic_stream_factory.h" 5 #include "net/quic/quic_stream_factory.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "net/cert/cert_verifier.h" 9 #include "net/cert/cert_verifier.h"
10 #include "net/dns/mock_host_resolver.h" 10 #include "net/dns/mock_host_resolver.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 header.entropy_flag = false; 65 header.entropy_flag = false;
66 header.fec_flag = false; 66 header.fec_flag = false;
67 header.fec_group = 0; 67 header.fec_group = 0;
68 68
69 QuicAckFrame ack(largest_received, QuicTime::Zero(), least_unacked); 69 QuicAckFrame ack(largest_received, QuicTime::Zero(), least_unacked);
70 QuicCongestionFeedbackFrame feedback; 70 QuicCongestionFeedbackFrame feedback;
71 feedback.type = kTCP; 71 feedback.type = kTCP;
72 feedback.tcp.accumulated_number_of_lost_packets = 0; 72 feedback.tcp.accumulated_number_of_lost_packets = 0;
73 feedback.tcp.receive_window = 16000; 73 feedback.tcp.receive_window = 16000;
74 74
75 QuicFramer framer(kQuicVersion1, QuicTime::Zero(), false); 75 QuicFramer framer(QuicVersionMax(), QuicTime::Zero(), false);
76 QuicFrames frames; 76 QuicFrames frames;
77 frames.push_back(QuicFrame(&ack)); 77 frames.push_back(QuicFrame(&ack));
78 frames.push_back(QuicFrame(&feedback)); 78 frames.push_back(QuicFrame(&feedback));
79 scoped_ptr<QuicPacket> packet( 79 scoped_ptr<QuicPacket> packet(
80 framer.ConstructFrameDataPacket(header, frames).packet); 80 framer.ConstructFrameDataPacket(header, frames).packet);
81 return scoped_ptr<QuicEncryptedPacket>(framer.EncryptPacket( 81 return scoped_ptr<QuicEncryptedPacket>(framer.EncryptPacket(
82 ENCRYPTION_NONE, header.packet_sequence_number, *packet)); 82 ENCRYPTION_NONE, header.packet_sequence_number, *packet));
83 } 83 }
84 84
85 // Returns a newly created packet to send congestion feedback data. 85 // Returns a newly created packet to send congestion feedback data.
(...skipping 13 matching lines...) Expand all
99 frame.tcp.accumulated_number_of_lost_packets = 0; 99 frame.tcp.accumulated_number_of_lost_packets = 0;
100 frame.tcp.receive_window = 16000; 100 frame.tcp.receive_window = 16000;
101 101
102 return scoped_ptr<QuicEncryptedPacket>( 102 return scoped_ptr<QuicEncryptedPacket>(
103 ConstructPacket(header, QuicFrame(&frame))); 103 ConstructPacket(header, QuicFrame(&frame)));
104 } 104 }
105 105
106 scoped_ptr<QuicEncryptedPacket> ConstructPacket( 106 scoped_ptr<QuicEncryptedPacket> ConstructPacket(
107 const QuicPacketHeader& header, 107 const QuicPacketHeader& header,
108 const QuicFrame& frame) { 108 const QuicFrame& frame) {
109 QuicFramer framer(kQuicVersion1, QuicTime::Zero(), false); 109 QuicFramer framer(QuicVersionMax(), QuicTime::Zero(), false);
110 QuicFrames frames; 110 QuicFrames frames;
111 frames.push_back(frame); 111 frames.push_back(frame);
112 scoped_ptr<QuicPacket> packet( 112 scoped_ptr<QuicPacket> packet(
113 framer.ConstructFrameDataPacket(header, frames).packet); 113 framer.ConstructFrameDataPacket(header, frames).packet);
114 return scoped_ptr<QuicEncryptedPacket>(framer.EncryptPacket( 114 return scoped_ptr<QuicEncryptedPacket>(framer.EncryptPacket(
115 ENCRYPTION_NONE, header.packet_sequence_number, *packet)); 115 ENCRYPTION_NONE, header.packet_sequence_number, *packet));
116 } 116 }
117 117
118 MockHostResolver host_resolver_; 118 MockHostResolver host_resolver_;
119 DeterministicMockClientSocketFactory socket_factory_; 119 DeterministicMockClientSocketFactory socket_factory_;
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 stream.reset(); // Will reset stream 3. 297 stream.reset(); // Will reset stream 3.
298 298
299 EXPECT_TRUE(socket_data.at_read_eof()); 299 EXPECT_TRUE(socket_data.at_read_eof());
300 EXPECT_TRUE(socket_data.at_write_eof()); 300 EXPECT_TRUE(socket_data.at_write_eof());
301 EXPECT_TRUE(socket_data2.at_read_eof()); 301 EXPECT_TRUE(socket_data2.at_read_eof());
302 EXPECT_TRUE(socket_data2.at_write_eof()); 302 EXPECT_TRUE(socket_data2.at_write_eof());
303 } 303 }
304 304
305 } // namespace test 305 } // namespace test
306 } // namespace net 306 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698